merge of '68b677cc5ae237d521b127e852086eac5d000fd4'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 13:13:14 +0000 (13:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Jul 2007 13:13:14 +0000 (13:13 +0000)
commit275cf177e1dd0179d7c48dbf067115669b44b717
treed1f777f5bdad33c229712c12b502b04fdd7f587c
parent1c3a7b4dd773ad3fd5dd4ec79ddfbd95539ac15f
parent3727ffa17416fdeba40d208fac810b24498ebf78
Merge ... '68b677cc5ae237d521b127e852086eac5d000fd4'
     and 'e520909be2622e4bbdf3326729ffc870686d568e'