merge of '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 23:32:09 +0000 (23:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 23:32:09 +0000 (23:32 +0000)
commitba4001fe8c00586b71fb1043795e1b99e3234025
treece66a6f384b00812ad533d7b8975d5f8a8bd3402
parentd9a05430e070a497ca4db0a3f8f746fb952b5ecd
parenta962c31f95cc3e4eb996eff609e973bcd2d2fc5c
Merge ... '2b4e1c7a35c118cf363c771f015c4fdfa5f84731'
     and '36fe2f5bf87b5a8eedda174012a2e93f8bb5a8f5'