merge of '1585e84b2f1f1c143a60c4d80cd9b5f9dfd1bfa7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 24 Dec 2007 13:36:38 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 24 Dec 2007 13:36:38 +0000 (13:36 +0000)
commit56925a146ae316502cc187bc9ec1fc24428a3020
treebaf3fea70d8462561dd768759fecfc9b84ca2000
parent3c63c62c6948aa0db5867b487717805944074e09
parent5307c9dd6bb7d0395eb3fb7286f42c2bc05d57db
Merge ... '1585e84b2f1f1c143a60c4d80cd9b5f9dfd1bfa7'
     and 'a0bced98fc660149756ffa812a313c6b5fdbeaa1'