merge of '2dbe8d19c2e0b6dfda1f3acddb9f778f0711d4a0'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 26 Jul 2007 14:13:31 +0000 (14:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 26 Jul 2007 14:13:31 +0000 (14:13 +0000)
commit8c744fbb3fee05c49a1130582f8d83003d086b5f
tree9546d5cd5ae68ad344a06f75621095097e83e1ed
parent217eacb5d1eedaaa41a327ecea4b787e5952ae93
parentadc6f74c5f0826e821013d81ddd67c082f2f694d
Merge ... '2dbe8d19c2e0b6dfda1f3acddb9f778f0711d4a0'
     and '8219b55031fbe63e3c3d0da9bb3ba9f142467029'