merge of 'dd9ddcf7f0679e8a8bd188c7a05defba089c118d'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 11:41:46 +0000 (11:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 28 Feb 2008 11:41:46 +0000 (11:41 +0000)
commitf7f978ec4687b54a09967df27fbbce9a399d9cff
treebdbcb0501e5d1ba838f46a69225ae9bcf6bd48a4
parentf5b0cc9973d24a6e6bb9981a5ba16cf57095d1d3
parent15ad3f7014c91008312af77de2c6cb62664c9c38
Merge ... 'dd9ddcf7f0679e8a8bd188c7a05defba089c118d'
     and 'fc5266affca09a60f8b05cce834b4c517e7e4003'