merge of '76f17964c43f7ddee34e65c3b91d78a68aecd213'
authorStefan Schmidt <stefan@datenfreihafen.org>
Fri, 7 Sep 2007 21:38:18 +0000 (21:38 +0000)
committerStefan Schmidt <stefan@datenfreihafen.org>
Fri, 7 Sep 2007 21:38:18 +0000 (21:38 +0000)
     and '83398e1336b5456cc5a8661377b3819a02cc3ba2'


Trivial merge