merge of '27de58a95c41839b956f23d0aba523fd7b5b6560'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:22:54 +0000 (19:22 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:22:54 +0000 (19:22 +0000)
     and '41476408af360dd3a822d53b5492d058b04347ab'


Trivial merge