merge of '389aed28979c814d3706b4a96498170e50800a5b'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 23:02:45 +0000 (23:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 13 Dec 2007 23:02:45 +0000 (23:02 +0000)
     and 'f5aa47e401818b4b23bbbe7d7d767f86adbe7858'


Trivial merge