merge of '81ef71fa69009396b145139571c2cbaa3855d705'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 00:38:21 +0000 (00:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 11 Jun 2008 00:38:21 +0000 (00:38 +0000)
commit5f315f57169b07c470244ba3bed197b1a666a3d2
tree1a5ca35049abfddabdde44b0d4040c8c7ea0e069
parent72481692826ab2e76d9b5f6e04101520dc386ce9
parent8993f246c593e78038f7422c24897bfd16348945
Merge ... '81ef71fa69009396b145139571c2cbaa3855d705'
     and 'e5e89d63d424e7df2e0ca809c9cfd4220f57efaa'