merge of '1db4a1963f828f283453e291a320f435c7f3d4d9'
authorDaniel Willmann <daniel@totalueberwachung.de>
Mon, 17 Dec 2007 20:23:38 +0000 (20:23 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Mon, 17 Dec 2007 20:23:38 +0000 (20:23 +0000)
     and '3132d9c745c8a24622816b263ac02647c0bbc724'


Trivial merge