2 patches for repository davidsarah@dev.allmydata.org:/home/darcs/tahoe/trunk:
Wed Jul 13 01:12:18 BST 2011 david-sarah@jacaranda.org
* WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104
Wed Jul 13 01:27:22 BST 2011 david-sarah@jacaranda.org
* docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104
New patches:
[WUI: change the label of the button to unlink a file from 'del' to 'unlink'. Also change some internal names to 'unlink', and allow 't=unlink' as a synonym for 't=delete' in the web-API interface. Incidentally, improve a test to check for the rename button as well as the unlink button. fixes #1104
david-sarah@jacaranda.org**20110713001218
Ignore-this: 3eef6b3f81b94a9c0020a38eb20aa069
] {
hunk ./docs/frontends/webapi.rst 91
operations are required to have no side-effects.
PUT is used to upload new objects into the filesystem, or to replace an
-existing object. DELETE it used to delete objects from the filesystem. Both
+existing object. DELETE is used to delete objects from the filesystem. Both
PUT and DELETE are required to be idempotent: performing the same operation
multiple times must have the same side-effects as only performing it once.
hunk ./docs/frontends/webapi.rst 1162
into the subtree will see that the child subdirectories are not modified by
this operation. Only the link from the given directory to its child is severed.
+ In Tahoe-LAFS v1.9.0 and later, t=unlink can be used as a synonym for t=delete.
+ If interoperability with older web-API servers is required, t=delete should
+ be used.
+
+
Renaming A Child
----------------
hunk ./src/allmydata/test/test_web.py 1088
r'\s+
%d
' % len(self.BAR_CONTENTS),
])
self.failUnless(re.search(get_bar, res), res)
- for line in res.split("\n"):
- # find the line that contains the delete button for bar.txt
- if ("form action" in line and
- 'value="delete"' in line and
- 'value="bar.txt"' in line):
- # the form target should use a relative URL
- foo_url = urllib.quote("%s/uri/%s/" % (ROOT, self._foo_uri))
- self.failUnless(('action="%s"' % foo_url) in line, line)
- # and the when_done= should too
- #done_url = urllib.quote(???)
- #self.failUnless(('name="when_done" value="%s"' % done_url)
- # in line, line)
- break
- else:
- self.fail("unable to find delete-bar.txt line", res)
+ for label in ['unlink', 'rename']:
+ for line in res.split("\n"):
+ # find the line that contains the relevant button for bar.txt
+ if ("form action" in line and
+ ('value="%s"' % (label,)) in line and
+ 'value="bar.txt"' in line):
+ # the form target should use a relative URL
+ foo_url = urllib.quote("%s/uri/%s/" % (ROOT, self._foo_uri))
+ self.failUnlessIn('action="%s"' % foo_url, line)
+ # and the when_done= should too
+ #done_url = urllib.quote(???)
+ #self.failUnlessIn('name="when_done" value="%s"' % done_url, line)
+
+ # 'unlink' needs to use POST because it directly has a side effect
+ if label == 'unlink':
+ self.failUnlessIn('method="post"', line)
+ break
+ else:
+ self.fail("unable to find '%s bar.txt' line" % (label,), res)
# the DIR reference just points to a URI
sub_url = ("%s/uri/%s/" % (ROOT, urllib.quote(self._sub_uri)))
hunk ./src/allmydata/test/test_web.py 2637
d.addCallback(self.failUnlessIsBarDotTxt)
return d
- def test_POST_delete(self):
- d = self.POST(self.public_url + "/foo", t="delete", name="bar.txt")
+ def test_POST_delete(self, command_name='delete'):
+ d = self._foo_node.list()
+ def _check_before(children):
+ self.failUnless(u"bar.txt" in children)
+ d.addCallback(_check_before)
+ d.addCallback(lambda res: self.POST(self.public_url + "/foo", t=command_name, name="bar.txt"))
d.addCallback(lambda res: self._foo_node.list())
hunk ./src/allmydata/test/test_web.py 2644
- def _check(children):
+ def _check_after(children):
self.failIf(u"bar.txt" in children)
hunk ./src/allmydata/test/test_web.py 2646
- d.addCallback(_check)
+ d.addCallback(_check_after)
return d
hunk ./src/allmydata/test/test_web.py 2649
+ def test_POST_unlink(self):
+ return self.test_POST_delete(command_name='unlink')
+
def test_POST_rename_file(self):
d = self.POST(self.public_url + "/foo", t="rename",
from_name="bar.txt", to_name='wibble.txt')
hunk ./src/allmydata/web/directory.py 205
d = self._POST_upload(ctx) # this one needs the context
elif t == "uri":
d = self._POST_uri(req)
- elif t == "delete":
- d = self._POST_delete(req)
+ elif t == "delete" or t == "unlink":
+ d = self._POST_unlink(req)
elif t == "rename":
d = self._POST_rename(req)
elif t == "check":
hunk ./src/allmydata/web/directory.py 364
d.addCallback(lambda res: childcap)
return d
- def _POST_delete(self, req):
+ def _POST_unlink(self, req):
name = get_arg(req, "name")
if name is None:
# apparently an
hunk ./src/allmydata/web/directory.py 369
# won't show up in the resulting encoded form.. the 'name'
- # field is completely missing. So to allow deletion of an
- # empty file, we have to pretend that None means ''. The only
- # downside of this is a slightly confusing error message if
- # someone does a POST without a name= field. For our own HTML
- # this isn't a big deal, because we create the 'delete' POST
- # buttons ourselves.
+ # field is completely missing. So to allow unlinking of a
+ # child with a name that is the empty string, we have to
+ # pretend that None means ''. The only downside of this is
+ # a slightly confusing error message if someone does a POST
+ # without a name= field. For our own HTML this isn't a big
+ # deal, because we create the 'unlink' POST buttons ourselves.
name = ''
charset = get_arg(req, "_charset", "utf-8")
name = name.decode(charset)
hunk ./src/allmydata/web/directory.py 379
d = self.node.delete(name)
- d.addCallback(lambda res: "thing deleted")
+ d.addCallback(lambda res: "thing unlinked")
return d
def _POST_rename(self, req):
hunk ./src/allmydata/web/directory.py 647
root = get_root(ctx)
here = "%s/uri/%s/" % (root, urllib.quote(self.node.get_uri()))
if self.node.is_unknown() or self.node.is_readonly():
- delete = "-"
+ unlink = "-"
rename = "-"
else:
hunk ./src/allmydata/web/directory.py 650
- # this creates a button which will cause our child__delete method
- # to be invoked, which deletes the file and then redirects the
+ # this creates a button which will cause our _POST_unlink method
+ # to be invoked, which unlinks the file and then redirects the
# browser back to this directory
hunk ./src/allmydata/web/directory.py 653
- delete = T.form(action=here, method="post")[
- T.input(type='hidden', name='t', value='delete'),
+ unlink = T.form(action=here, method="post")[
+ T.input(type='hidden', name='t', value='unlink'),
T.input(type='hidden', name='name', value=name),
T.input(type='hidden', name='when_done', value="."),
hunk ./src/allmydata/web/directory.py 657
- T.input(type='submit', value='del', name="del"),
+ T.input(type='submit', value='unlink', name="unlink"),
]
rename = T.form(action=here, method="get")[
hunk ./src/allmydata/web/directory.py 667
T.input(type='submit', value='rename', name="rename"),
]
- ctx.fillSlots("delete", delete)
+ ctx.fillSlots("unlink", unlink)
ctx.fillSlots("rename", rename)
times = []
hunk ./src/allmydata/web/directory.xhtml 34
-
+
}
[docs: some changes of 'delete' or 'rm' to 'unlink'. refs #1104
david-sarah@jacaranda.org**20110713002722
Ignore-this: 304d2a330d5e6e77d5f1feed7814b21c
] {
hunk ./docs/frontends/CLI.rst 47
The "``tahoe``" tool provides access to three categories of commands.
* node management: create a client/server node, start/stop/restart it
-* filesystem manipulation: list files, upload, download, delete, rename
+* filesystem manipulation: list files, upload, download, unlink, rename
* debugging: unpack cap-strings, examine share files
To get a list of all commands, just run "``tahoe``" with no additional
hunk ./docs/frontends/CLI.rst 137
=======================
These commands let you exmaine a Tahoe-LAFS filesystem, providing basic
-list/upload/download/delete/rename/mkdir functionality. They can be used as
+list/upload/download/unlink/rename/mkdir functionality. They can be used as
primitives by other scripts. Most of these commands are fairly thin wrappers
around web-API calls, which are described in ``_.
hunk ./docs/frontends/CLI.rst 351
This uses the python 'webbrowser' module to cause a local web browser to
open to the web page for the given directory. This page offers interfaces to
- add, download, rename, and delete files in the directory. If no alias or
- path is given, this command opens the root directory of the default
- ``tahoe:`` alias.
+ add, download, rename, and unlink files and subdirectories in that directory.
+ If no alias or path is given, this command opens the root directory of the
+ default ``tahoe:`` alias.
``tahoe put file.txt``
hunk ./docs/frontends/CLI.rst 434
This copies a file from your ``tahoe:`` root to a different directory, set up
earlier with "``tahoe add-alias fun DIRCAP``" or "``tahoe create-alias fun``".
-``tahoe rm uploaded.txt``
+``tahoe unlink uploaded.txt``
hunk ./docs/frontends/CLI.rst 436
-``tahoe rm tahoe:uploaded.txt``
+``tahoe unlink tahoe:uploaded.txt``
hunk ./docs/frontends/CLI.rst 438
- This deletes a file from your ``tahoe:`` root.
+ This unlinks a file from your ``tahoe:`` root (that is, causes there to no
+ longer be an entry ``uploaded.txt`` in the root directory that points to it).
+ Note that this does not delete the file from the grid.
+ For backward compatibility, ``tahoe rm`` is accepted as a synonym for
+ ``tahoe unlink``.
``tahoe mv uploaded.txt renamed.txt``
hunk ./docs/specifications/dirnodes.rst 391
and care about specific dirnodes can ask to keep them alive for a while, by
renewing a lease on them (with a typical period of one month). Clients are
expected to assist in the deletion of dirnodes by canceling their leases as
-soon as they are done with them. This means that when a client deletes a
+soon as they are done with them. This means that when a client unlinks a
directory, it should also cancel its lease on that directory. When the lease
count on a given share goes to zero, the storage server can delete the
related storage. Multiple clients may all have leases on the same dirnode:
}
Context:
[add Protovis.js-based download-status timeline visualization
Brian Warner **20110629222606
Ignore-this: 477ccef5c51b30e246f5b6e04ab4a127
provide status overlap info on the webapi t=json output, add decode/decrypt
rate tooltips, add zoomin/zoomout buttons
]
[add more download-status data, fix tests
Brian Warner **20110629222555
Ignore-this: e9e0b7e0163f1e95858aa646b9b17b8c
]
[prepare for viz: improve DownloadStatus events
Brian Warner **20110629222542
Ignore-this: 16d0bde6b734bb501aa6f1174b2b57be
consolidate IDownloadStatusHandlingConsumer stuff into DownloadNode
]
[docs: fix error in crypto specification that was noticed by Taylor R Campbell
zooko@zooko.com**20110629185711
Ignore-this: b921ed60c1c8ba3c390737fbcbe47a67
]
[setup.py: don't make bin/tahoe.pyscript executable. fixes #1347
david-sarah@jacaranda.org**20110130235809
Ignore-this: 3454c8b5d9c2c77ace03de3ef2d9398a
]
[Makefile: remove targets relating to 'setup.py check_auto_deps' which no longer exists. fixes #1345
david-sarah@jacaranda.org**20110626054124
Ignore-this: abb864427a1b91bd10d5132b4589fd90
]
[Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
david-sarah@jacaranda.org**20110623205528
Ignore-this: c63e23146c39195de52fb17c7c49b2da
]
[Rename test_package_initialization.py to (much shorter) test_import.py .
Brian Warner **20110611190234
Ignore-this: 3eb3dbac73600eeff5cfa6b65d65822
The former name was making my 'ls' listings hard to read, by forcing them
down to just two columns.
]
[tests: fix tests to accomodate [20110611153758-92b7f-0ba5e4726fb6318dac28fb762a6512a003f4c430]
zooko@zooko.com**20110611163741
Ignore-this: 64073a5f39e7937e8e5e1314c1a302d1
Apparently none of the two authors (stercor, terrell), three reviewers (warner, davidsarah, terrell), or one committer (me) actually ran the tests. This is presumably due to #20.
fixes #1412
]
[wui: right-align the size column in the WUI
zooko@zooko.com**20110611153758
Ignore-this: 492bdaf4373c96f59f90581c7daf7cd7
Thanks to Ted "stercor" Rolle Jr. and Terrell Russell.
fixes #1412
]
[docs: three minor fixes
zooko@zooko.com**20110610121656
Ignore-this: fec96579eb95aceb2ad5fc01a814c8a2
CREDITS for arc for stats tweak
fix link to .zip file in quickstart.rst (thanks to ChosenOne for noticing)
English usage tweak
]
[server.py: get_latencies now reports percentiles _only_ if there are sufficient observations for the interpretation of the percentile to be unambiguous.
wilcoxjg@gmail.com**20110527120135
Ignore-this: 2e7029764bffc60e26f471d7c2b6611e
interfaces.py: modified the return type of RIStatsProvider.get_stats to allow for None as a return value
NEWS.rst, stats.py: documentation of change to get_latencies
stats.rst: now documents percentile modification in get_latencies
test_storage.py: test_latencies now expects None in output categories that contain too few samples for the associated percentile to be unambiguously reported.
fixes #1392
]
[corrected "k must never be smaller than N" to "k must never be greater than N"
secorp@allmydata.org**20110425010308
Ignore-this: 233129505d6c70860087f22541805eac
]
[docs/running.rst: fix stray HTML (not .rst) link noticed by ChosenOne.
david-sarah@jacaranda.org**20110609223719
Ignore-this: fc50ac9c94792dcac6f1067df8ac0d4a
]
[docs: revert link in relnotes.txt from NEWS.rst to NEWS, since the former did not exist at revision 5000.
david-sarah@jacaranda.org**20110517011214
Ignore-this: 6a5be6e70241e3ec0575641f64343df7
]
[docs: convert NEWS to NEWS.rst and change all references to it.
david-sarah@jacaranda.org**20110517010255
Ignore-this: a820b93ea10577c77e9c8206dbfe770d
]
[docs: remove out-of-date docs/testgrid/introducer.furl and containing directory. fixes #1404
david-sarah@jacaranda.org**20110512140559
Ignore-this: 784548fc5367fac5450df1c46890876d
]
[scripts/common.py: don't assume that the default alias is always 'tahoe' (it is, but the API of get_alias doesn't say so). refs #1342
david-sarah@jacaranda.org**20110130164923
Ignore-this: a271e77ce81d84bb4c43645b891d92eb
]
[setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError
zooko@zooko.com**20110128142006
Ignore-this: 57d4bc9298b711e4bc9dc832c75295de
I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement().
]
[M-x whitespace-cleanup
zooko@zooko.com**20110510193653
Ignore-this: dea02f831298c0f65ad096960e7df5c7
]
[docs: fix typo in running.rst, thanks to arch_o_median
zooko@zooko.com**20110510193633
Ignore-this: ca06de166a46abbc61140513918e79e8
]
[relnotes.txt: don't claim to work on Cygwin (which has been untested for some time). refs #1342
david-sarah@jacaranda.org**20110204204902
Ignore-this: 85ef118a48453d93fa4cddc32d65b25b
]
[relnotes.txt: forseeable -> foreseeable. refs #1342
david-sarah@jacaranda.org**20110204204116
Ignore-this: 746debc4d82f4031ebf75ab4031b3a9
]
[replace remaining .html docs with .rst docs
zooko@zooko.com**20110510191650
Ignore-this: d557d960a986d4ac8216d1677d236399
Remove install.html (long since deprecated).
Also replace some obsolete references to install.html with references to quickstart.rst.
Fix some broken internal references within docs/historical/historical_known_issues.txt.
Thanks to Ravi Pinjala and Patrick McDonald.
refs #1227
]
[docs: FTP-and-SFTP.rst: fix a minor error and update the information about which version of Twisted fixes #1297
zooko@zooko.com**20110428055232
Ignore-this: b63cfb4ebdbe32fb3b5f885255db4d39
]
[munin tahoe_files plugin: fix incorrect file count
francois@ctrlaltdel.ch**20110428055312
Ignore-this: 334ba49a0bbd93b4a7b06a25697aba34
fixes #1391
]
[Fix a test failure in test_package_initialization on Python 2.4.x due to exceptions being stringified differently than in later versions of Python. refs #1389
david-sarah@jacaranda.org**20110411190738
Ignore-this: 7847d26bc117c328c679f08a7baee519
]
[tests: add test for including the ImportError message and traceback entry in the summary of errors from importing dependencies. refs #1389
david-sarah@jacaranda.org**20110410155844
Ignore-this: fbecdbeb0d06a0f875fe8d4030aabafa
]
[allmydata/__init__.py: preserve the message and last traceback entry (file, line number, function, and source line) of ImportErrors in the package versions string. fixes #1389
david-sarah@jacaranda.org**20110410155705
Ignore-this: 2f87b8b327906cf8bfca9440a0904900
]
[remove unused variable detected by pyflakes
zooko@zooko.com**20110407172231
Ignore-this: 7344652d5e0720af822070d91f03daf9
]
[allmydata/__init__.py: Nicer reporting of unparseable version numbers in dependencies. fixes #1388
david-sarah@jacaranda.org**20110401202750
Ignore-this: 9c6bd599259d2405e1caadbb3e0d8c7f
]
[update FTP-and-SFTP.rst: the necessary patch is included in Twisted-10.1
Brian Warner **20110325232511
Ignore-this: d5307faa6900f143193bfbe14e0f01a
]
[control.py: remove all uses of s.get_serverid()
warner@lothar.com**20110227011203
Ignore-this: f80a787953bd7fa3d40e828bde00e855
]
[web: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011159
Ignore-this: a9347d9cf6436537a47edc6efde9f8be
]
[immutable/downloader/fetcher.py: remove all get_serverid() calls
warner@lothar.com**20110227011156
Ignore-this: fb5ef018ade1749348b546ec24f7f09a
]
[immutable/downloader/fetcher.py: fix diversity bug in server-response handling
warner@lothar.com**20110227011153
Ignore-this: bcd62232c9159371ae8a16ff63d22c1b
When blocks terminate (either COMPLETE or CORRUPT/DEAD/BADSEGNUM), the
_shares_from_server dict was being popped incorrectly (using shnum as the
index instead of serverid). I'm still thinking through the consequences of
this bug. It was probably benign and really hard to detect. I think it would
cause us to incorrectly believe that we're pulling too many shares from a
server, and thus prefer a different server rather than asking for a second
share from the first server. The diversity code is intended to spread out the
number of shares simultaneously being requested from each server, but with
this bug, it might be spreading out the total number of shares requested at
all, not just simultaneously. (note that SegmentFetcher is scoped to a single
segment, so the effect doesn't last very long).
]
[immutable/downloader/share.py: reduce get_serverid(), one left, update ext deps
warner@lothar.com**20110227011150
Ignore-this: d8d56dd8e7b280792b40105e13664554
test_download.py: create+check MyShare instances better, make sure they share
Server objects, now that finder.py cares
]
[immutable/downloader/finder.py: reduce use of get_serverid(), one left
warner@lothar.com**20110227011146
Ignore-this: 5785be173b491ae8a78faf5142892020
]
[immutable/offloaded.py: reduce use of get_serverid() a bit more
warner@lothar.com**20110227011142
Ignore-this: b48acc1b2ae1b311da7f3ba4ffba38f
]
[immutable/upload.py: reduce use of get_serverid()
warner@lothar.com**20110227011138
Ignore-this: ffdd7ff32bca890782119a6e9f1495f6
]
[immutable/checker.py: remove some uses of s.get_serverid(), not all
warner@lothar.com**20110227011134
Ignore-this: e480a37efa9e94e8016d826c492f626e
]
[add remaining get_* methods to storage_client.Server, NoNetworkServer, and
warner@lothar.com**20110227011132
Ignore-this: 6078279ddf42b179996a4b53bee8c421
MockIServer stubs
]
[upload.py: rearrange _make_trackers a bit, no behavior changes
warner@lothar.com**20110227011128
Ignore-this: 296d4819e2af452b107177aef6ebb40f
]
[happinessutil.py: finally rename merge_peers to merge_servers
warner@lothar.com**20110227011124
Ignore-this: c8cd381fea1dd888899cb71e4f86de6e
]
[test_upload.py: factor out FakeServerTracker
warner@lothar.com**20110227011120
Ignore-this: 6c182cba90e908221099472cc159325b
]
[test_upload.py: server-vs-tracker cleanup
warner@lothar.com**20110227011115
Ignore-this: 2915133be1a3ba456e8603885437e03
]
[happinessutil.py: server-vs-tracker cleanup
warner@lothar.com**20110227011111
Ignore-this: b856c84033562d7d718cae7cb01085a9
]
[upload.py: more tracker-vs-server cleanup
warner@lothar.com**20110227011107
Ignore-this: bb75ed2afef55e47c085b35def2de315
]
[upload.py: fix var names to avoid confusion between 'trackers' and 'servers'
warner@lothar.com**20110227011103
Ignore-this: 5d5e3415b7d2732d92f42413c25d205d
]
[refactor: s/peer/server/ in immutable/upload, happinessutil.py, test_upload
warner@lothar.com**20110227011100
Ignore-this: 7ea858755cbe5896ac212a925840fe68
No behavioral changes, just updating variable/method names and log messages.
The effects outside these three files should be minimal: some exception
messages changed (to say "server" instead of "peer"), and some internal class
names were changed. A few things still use "peer" to minimize external
changes, like UploadResults.timings["peer_selection"] and
happinessutil.merge_peers, which can be changed later.
]
[storage_client.py: clean up test_add_server/test_add_descriptor, remove .test_servers
warner@lothar.com**20110227011056
Ignore-this: efad933e78179d3d5fdcd6d1ef2b19cc
]
[test_client.py, upload.py:: remove KiB/MiB/etc constants, and other dead code
warner@lothar.com**20110227011051
Ignore-this: dc83c5794c2afc4f81e592f689c0dc2d
]
[test: increase timeout on a network test because Francois's ARM machine hit that timeout
zooko@zooko.com**20110317165909
Ignore-this: 380c345cdcbd196268ca5b65664ac85b
I'm skeptical that the test was proceeding correctly but ran out of time. It seems more likely that it had gotten hung. But if we raise the timeout to an even more extravagant number then we can be even more certain that the test was never going to finish.
]
[docs/configuration.rst: add a "Frontend Configuration" section
Brian Warner **20110222014323
Ignore-this: 657018aa501fe4f0efef9851628444ca
this points to docs/frontends/*.rst, which were previously underlinked
]
[web/filenode.py: avoid calling req.finish() on closed HTTP connections. Closes #1366
"Brian Warner "**20110221061544
Ignore-this: 799d4de19933f2309b3c0c19a63bb888
]
[Add unit tests for cross_check_pkg_resources_versus_import, and a regression test for ref #1355. This requires a little refactoring to make it testable.
david-sarah@jacaranda.org**20110221015817
Ignore-this: 51d181698f8c20d3aca58b057e9c475a
]
[allmydata/__init__.py: .name was used in place of the correct .__name__ when printing an exception. Also, robustify string formatting by using %r instead of %s in some places. fixes #1355.
david-sarah@jacaranda.org**20110221020125
Ignore-this: b0744ed58f161bf188e037bad077fc48
]
[Refactor StorageFarmBroker handling of servers
Brian Warner **20110221015804
Ignore-this: 842144ed92f5717699b8f580eab32a51
Pass around IServer instance instead of (peerid, rref) tuple. Replace
"descriptor" with "server". Other replacements:
get_all_servers -> get_connected_servers/get_known_servers
get_servers_for_index -> get_servers_for_psi (now returns IServers)
This change still needs to be pushed further down: lots of code is now
getting the IServer and then distributing (peerid, rref) internally.
Instead, it ought to distribute the IServer internally and delay
extracting a serverid or rref until the last moment.
no_network.py was updated to retain parallelism.
]
[TAG allmydata-tahoe-1.8.2
warner@lothar.com**20110131020101]
Patch bundle hash:
1bd3d89e65fcd55f6ab19a05c274d8a1f0928611