merge of '1e83baccab5ff8f9286b326ca23932f59ccea5b0'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 00:14:10 +0000 (00:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 00:14:10 +0000 (00:14 +0000)
commit9feb3c3ffe516efe8205d0f6c99af3a22d5c8115
tree64e42e0fec6b034f9b9ebd181cf7e3ff92141430
parent89a425310ccdaee19b97091b7ee584fe98b4a6ea
parente3e2e97be9b8bbc8a08819932c5ffb9babffd614
Merge ... '1e83baccab5ff8f9286b326ca23932f59ccea5b0'
     and '50f929f94594bd46c5cccc70110c1de0e52a0ee4'