merge r6415-6416 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:20:46 +0000 (00:20 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 00:20:46 +0000 (00:20 +0000)
commitf5238ed626ff498cbcefd951366c7f47b20c74a8
tree1af59d5b85f0a26d3d94ad532ddcad5dc5fbd725
parent5f9bfb15ad95b637f86cd068cb2c28094b91ec85
merge r6415-6416 from trunk
Makefile.am