merge of '878f6895b40f34c695cfef0d475e299f1a2d8eda'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 16:12:10 +0000 (16:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 4 Oct 2008 16:12:10 +0000 (16:12 +0000)
commit3d5789b99ac2339ea96cb3d993c55c9f1a71eddf
tree4e3f62a57f0274d9e08d32da564348af8b5f5a02
parent60d8c0365c0446c93ec050e662f26bcb62cb3254
parent0efef5b382ddc44841ec101eae4f5c2bd2257a0f
Merge ... '878f6895b40f34c695cfef0d475e299f1a2d8eda'
     and 'a6240987d2107aef28e1c5419eb7da825ff812f5'