merge of '6c2994d284da06ed60c607d89622f27c35c68b0e'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:41 +0000 (09:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jul 2008 09:12:41 +0000 (09:12 +0000)
commitc402c5af43c5881feba53c224b27cb2f0c58bec0
treee1663b0c9405ec984952a10a4f4f5dd06bc5cb74
parentf341777c4bf277731c4ff8b776f09ad38ed4f00b
parenta7b535066025fea712e253cd0951f244ec4bbaf8
Merge ... '6c2994d284da06ed60c607d89622f27c35c68b0e'
     and 'da3452ccd1d6234cb9dbbfb85923cce269a1daa7'