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)
     and 'f7fb409ce8abfb0a3e4ef36fe058a6fbb429a7b6'


Trivial merge