merge of 'bbd77769487ba7800c127ef99922a89662346ef8'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 2 Oct 2008 09:48:11 +0000 (09:48 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 2 Oct 2008 09:48:11 +0000 (09:48 +0000)
     and 'be485c84bb9a8d25a9cd1b39d2c18322e0a20602'


Trivial merge