merge of '7b528e427242c4fc04839c0b8e3f065248b5c0dc'
authorDaniel Willmann <daniel@totalueberwachung.de>
Sun, 23 Dec 2007 11:34:37 +0000 (11:34 +0000)
committerDaniel Willmann <daniel@totalueberwachung.de>
Sun, 23 Dec 2007 11:34:37 +0000 (11:34 +0000)
     and 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'


Trivial merge