merge of '4363471130869dabc3d90ccdcff57628e3ce25e1'
authorDaniel Willmann <daniel@totalueberwachung.de>
Tue, 31 Jul 2007 08:55:33 +0000 (08:55 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Tue, 31 Jul 2007 08:55:33 +0000 (08:55 +0000)
     and '946f6774a1edb3f5f17a2c7edc4dcb1d0a8be5fe'


Trivial merge