merge of '16ddc63cc58ab4f6ac83a2e1d653c740ffdd6f87'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 30 Aug 2007 22:36:16 +0000 (22:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 30 Aug 2007 22:36:16 +0000 (22:36 +0000)
commit295f0eb481ce73f976bc46031fa33551375d77cf
tree05128354e9e08c744377763a48f95398c5dfa8fd
parent328141d34f35516a988d7525f704064c6c55737d
parentd7d57f3e05feab6e49a2264f6e81902c28682049
Merge ... '16ddc63cc58ab4f6ac83a2e1d653c740ffdd6f87'
     and '76b3eaaf78af7bef8ae185d70ad72a4c8f9a3af7'