merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Dec 2007 19:44:05 +0000 (19:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 3 Dec 2007 19:44:05 +0000 (19:44 +0000)
     and '6fe2cd0b60b675a1e3118d25934adb4693f3b8ed'


Trivial merge