merge of '274270bd49f45e5d154a09560078fd8473cebef3'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 3 Jan 2008 14:37:37 +0000 (14:37 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 3 Jan 2008 14:37:37 +0000 (14:37 +0000)
     and 'd12a899d666597c4750ce96df9085900d2d639c7'


Trivial merge