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)
commit8f696bb12f7f311b65b2a1522299428917cf4311
tree0e4d33cc3f111c3c98a615a48c082a253fa24e4a
parent93ecb6b1ee315caafe63e3d0cac0174a05dea179
parent661d86969203a5dfb3788e4cde3c43c56b84e071
Merge ... '389aed28979c814d3706b4a96498170e50800a5b'
     and 'f5aa47e401818b4b23bbbe7d7d767f86adbe7858'