merge of '7bdd98510b75cefe2a4f144066db7428f35bf824'
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 13:47:36 +0000 (13:47 +0000)
committerPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 23 Aug 2007 13:47:36 +0000 (13:47 +0000)
     and '9064298a7c8666a75d79b14e539de1aba05de36f'


Trivial merge