merge of '838eb6a07e13b6913dd7a7eebee5e18544c4e6ae'
authorDaniel Willmann <daniel@totalueberwachung.de>
Sun, 16 Dec 2007 14:21:22 +0000 (14:21 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Sun, 16 Dec 2007 14:21:22 +0000 (14:21 +0000)
     and 'c4c17ca83d23bc51028aa72cd2f94ead9497b597'


Trivial merge