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)
commit48e0d0bf8aea431dfd34bfbf03009940962f0409
treec701d4ac7539814e8ed432fb7f25b6edaef08f96
parent5893063c8101d0f23c6c743909a6979bcc51f493
parent2c001290ff1c1827be9c3a227b6d9c0554661f9e
Merge ... '8d8ae2cc7d30dd97d45288b0abe0fb08f7a5841b'
     and 'aabb2e376786879bdd8142bbdcad15003a991fec'