merge of '88e2766fe8aa4c69dc8688e0554e2e6d05bb9c67'
authorDaniel Willmann <daniel@totalueberwachung.de>
Mon, 7 Jan 2008 23:45:57 +0000 (23:45 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Mon, 7 Jan 2008 23:45:57 +0000 (23:45 +0000)
     and 'f556521018478109967b108bb830f8109aefbb0e'


Trivial merge