merge of '47a626b064d50db51af7eff496004f9364e40f2d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 15:50:50 +0000 (15:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 15:50:50 +0000 (15:50 +0000)
     and 'a2824a6775b8569cf6a2471e00624e821562a181'


Trivial merge