Merge branch 'master' into renames-and-deprecations
authorDave Rolsky <autarch@houseabsolute.urth.org>
Fri, 27 Mar 2009 01:28:07 +0000 (20:28 -0500)
committerDave Rolsky <autarch@houseabsolute.urth.org>
Fri, 27 Mar 2009 01:28:07 +0000 (20:28 -0500)
commit3f036b3ef7a00ed718a3f72d916691003e345f0b
tree12dad7cf5cec5e0a5dc17ad160d1b154bb0ba18d
parentf5b0af77bf4082b2272b4ce37eae529cdcd745fc
parentfe2ed1fe3fd0bb94382caf839a5a0520ff2d2f6d
Merge branch 'master' into renames-and-deprecations