merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
authorDaniel Willmann <daniel@totalueberwachung.de>
Thu, 29 Nov 2007 20:10:20 +0000 (20:10 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Thu, 29 Nov 2007 20:10:20 +0000 (20:10 +0000)
     and '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'


Trivial merge