merge of 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 17 Feb 2008 18:22:31 +0000 (18:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 17 Feb 2008 18:22:31 +0000 (18:22 +0000)
commit2bd1b434ce09511ecc5ffe6b872162251ee1eab8
treed90ba00133e0860e009660eca6c5d4bcda6868e0
parent55f1bbed28e78a1f327b5ac198a0e54d02263890
parent673d1bb689817bb46661662b5d1459d587f038ab
Merge ... 'cb01f2744d89a35b7112e49fc0d5862aba66733f'
     and 'd0092933b0c82a6d8470e8da03507e0e5e71529c'