merge of 'bc23cf53ce799d3e52d33fa659150040636e3134'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jan 2008 17:02:51 +0000 (17:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 24 Jan 2008 17:02:51 +0000 (17:02 +0000)
commitf68ff6a19d85b3f7dd8f2cfd72840e340fa0b328
treea0f7c7179b4b75f91ecefbcf6273d0078a5e378a
parentca2dd4565504ad3239ca73c5cf23c234d57a71b8
parent62d4698b651ec93b84dcb2f04fffdbd2b420f103
Merge ... 'bc23cf53ce799d3e52d33fa659150040636e3134'
     and 'c0a3e474625678b13727e12b833983f6e3389de1'