merge of '298797d86056bd55b8e0191685cb8ae42de55f7d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 16:42:44 +0000 (16:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 6 Feb 2008 16:42:44 +0000 (16:42 +0000)
commit8f29644efce44f9059fb290b644047caf9146c1b
tree48988acb0aae4225fb1ef2c5599dba659ad6744d
parent670cceb7f604c6ad6edf47431326434574fbf114
parent1b7fb667944736d86e8b483727f87998083e8972
Merge ... '298797d86056bd55b8e0191685cb8ae42de55f7d'
     and 'e3a17e2ff263cac6d4b035034dc79a0e05fc548d'