merge of '93974111864d318a6e96f9646847c5a9647aa819'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 20 Aug 2007 17:55:36 +0000 (17:55 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 20 Aug 2007 17:55:36 +0000 (17:55 +0000)
commitde542fe9877144b7e0bd5226e0a3841887ce6c89
treeafe1514f88cbd3e8f5fa4f5a7432658cbfa14465
parent4f73b29c2b66b6d55caf55eccd59caa766086fa4
parent79acea313ac47165c6b3c55224484c4420e06720
Merge ... '93974111864d318a6e96f9646847c5a9647aa819'
     and 'f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6'