merge of '188473a4d5d33bffe571a9035d4bf0a983b463f0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 15:15:35 +0000 (15:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 15:15:35 +0000 (15:15 +0000)
commit1692a74344773b52af8b230e5e562243a6d98c4d
tree3e5a338051a5bdfb04c16e12b66712a68ed4297b
parent6e50c9e36c98b400543d602f674ec5a4899398e6
parent16c6101cf1f1ec91af70d9b327d1af8d108f59ff
Merge ... '188473a4d5d33bffe571a9035d4bf0a983b463f0'
     and 'ce6927ecdedbeb4d51a0e9f5e35a8515cab0ab09'