merge of '8d8ae2cc7d30dd97d45288b0abe0fb08f7a5841b'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 2 Aug 2007 09:56:42 +0000 (09:56 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 2 Aug 2007 09:56:42 +0000 (09:56 +0000)
     and 'aabb2e376786879bdd8142bbdcad15003a991fec'


Trivial merge