merge of '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
authorMatthias Hentges <oe@hentges.net>
Fri, 4 Jan 2008 14:10:51 +0000 (14:10 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 4 Jan 2008 14:10:51 +0000 (14:10 +0000)
commit6b3b57dfa59ae7b222455468b9618a74a65e6c96
tree8f65a1b197e6da15d2cefb45508b03136e73236b
parentac5cd102a7b7a2a37c2c228aeb8f43ebd7d617ac
parentdf936a73f8364e618f88d4675282188850835bfb
Merge ... '8015a13e63ef13c856f4a5a5f4e9b1fa3f143fa8'
     and '85ea4469c6c02accbb588d6edee46fd9a00ad12d'