merge of '148f8dde1ce484726500604f6b511b828737ed47'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 13:05:18 +0000 (13:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 22 Jun 2007 13:05:18 +0000 (13:05 +0000)
commit2f7f445a9c6463ce4a7cec1844911085b1536b1c
treef3ed9ddf17fba0b4368eb0280a0d0d30a6063da9
parenta4d78a7e5ba33f75870087241a07a453c7b39a6d
parentcfa20af7fa67637e65f733cc33e588b8b98c709d
Merge ... '148f8dde1ce484726500604f6b511b828737ed47'
     and '6ac0eb72e728e774076082cbfbb28ee430dc6485'