merge of '15abe433106a3416f43fe1507eb0032a960434bb'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:23:03 +0000 (19:23 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 17 Jan 2008 19:23:03 +0000 (19:23 +0000)
     and '2538d8c9c6f9647baba548394a1e20a2e4467a19'


Trivial merge