branch merge, cruft remove
authorJan-Kees van Kampen <vacca@goto10.org>
Sat, 18 Jul 2009 16:47:41 +0000 (18:47 +0200)
committerJan-Kees van Kampen <vacca@goto10.org>
Sat, 18 Jul 2009 16:47:41 +0000 (18:47 +0200)
commit9e233651084971c64bd1f401a52ee46183e7f360
tree4022717664ead36d9f5b6d632d79feef55111fc1
parent005728b970c7fbd9bd71bc03b37cf3856b8508e3
parentf27b9e06f3d86d3024ccd7d7fb8f3feb45c8d36a
branch merge, cruft remove