merge of '4d0f3853b3c01cedc22908ba269a7658acf2293b'
authorDirk Opfer <dirk@opfer-online.de>
Thu, 17 Jul 2008 08:22:06 +0000 (08:22 +0000)
committerDirk Opfer <dirk@opfer-online.de>
Thu, 17 Jul 2008 08:22:06 +0000 (08:22 +0000)
commitebecdfeb2163dcd68bf5a9a91acb3b475ba0eea7
tree2fb14059606b277ec9a832daad1d48282684af33
parentae4b0184afacd1535e1c54a5d11c0ade2dfde093
parent64caddc88d6901fea54b2265a1d44e26d061574a
Merge ... '4d0f3853b3c01cedc22908ba269a7658acf2293b'
     and '78b94abf5ca4361761610eb18c87c63d85d04e72'