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)
commit485571cde482594a85494905868eae7a46cfc3a1
tree85c9d059a1d26f15f2cd56144f2855aac2cc7784
parent0d240fc455c013943e170a70828d825ced38354e
parent17a572144f53d6f1abf1fee46d8e41c38e561b01
Merge ... '4a88a5ffedd700d28476cfaa227e1fde7e0a2fed'
     and '7cacda73f6295d69f1f1e7f92b77d847df223b1b'