merge of '0a1bbba5cea50e04cabcd0105f2b2fc40814b7a7'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 13:04:59 +0000 (13:04 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 13:04:59 +0000 (13:04 +0000)
     and '3b73bd5ada8f044f5d14445933e426ec92ff9f9e'


Trivial merge