merge of 'ef09a721c7151f303afbf272139ccaa2a7837c95'
authorDaniel Willmann <daniel@totalueberwachung.de>
Sat, 29 Dec 2007 15:33:15 +0000 (15:33 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Sat, 29 Dec 2007 15:33:15 +0000 (15:33 +0000)
     and 'f13cb61c97037453c70da8422448d96b08cfd5c9'


Trivial merge