merge of '42ff2b39da1a828b39b2827ebefd91262b2ea728'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 18:49:28 +0000 (18:49 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 27 Sep 2008 18:49:28 +0000 (18:49 +0000)
commit98fee68c313537aeaf56617cf49cf67a10f1b8c5
treed52932d0069f9dbdf03a99cb51584e8b5edbb02f
parent2f8ca4907776a3d69d8ceb15fd9b9b8e7acb436d
parent23e88e06a2cf63b687f4a82ca2e26111f1d8a878
Merge ... '42ff2b39da1a828b39b2827ebefd91262b2ea728'
     and '513ef8343cdc8a1d5beb9c8fa5298efc58162ffe'