merge of '73811d7124650e66801380a8372e169d5ed3e6bf'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 4 Nov 2007 16:34:48 +0000 (16:34 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 4 Nov 2007 16:34:48 +0000 (16:34 +0000)
commit56bbcefb2c81c9c543a04138445337c07cbe7069
treea2e253088245ef8c00da53a99281ac8051ebc65f
parent6457ba4d43022d4f9840a21b0e161c658cae4d2e
parent97849143bad1c470be6bb4bd4e8643c8dc6b849e
Merge ... '73811d7124650e66801380a8372e169d5ed3e6bf'
     and 'f76a52136a0ce25511ba98b2e3b3b6d52dd6af11'