merge of '00cf1e9e9df723231465c5cf66641ccf532f713a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 12:57:07 +0000 (12:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 3 Jul 2008 12:57:07 +0000 (12:57 +0000)
commit20e13e415084ca0399e0df7035654b9b7afdfb4c
treebc34a5cb12153cea62d94381b8b52a5f88c6c623
parente22b999e89d6ce2a02a398b13b1d21932aea13ee
parent05db31fa1307cec7691be6f83d927fe8f3d74317
Merge ... '00cf1e9e9df723231465c5cf66641ccf532f713a'
     and 'e238a221b694e010f2ded33d137e1ca76dec2b4f'