merge of '4a88a5ffedd700d28476cfaa227e1fde7e0a2fed'
authorMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 14:40:59 +0000 (14:40 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 23 Dec 2007 14:40:59 +0000 (14:40 +0000)
     and '7cacda73f6295d69f1f1e7f92b77d847df223b1b'


Trivial merge