merge of '1334265f6bc3427cfeef0ed8c21ef13a71da950c'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 12 Jul 2007 22:38:14 +0000 (22:38 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 12 Jul 2007 22:38:14 +0000 (22:38 +0000)
     and '455900b48a266ba79c042da92cdef20b5fe89006'


Trivial merge