merge of '17f165259b5092d4fb5def6145d429af967f491a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:32 +0000 (08:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:32 +0000 (08:15 +0000)
commit3f758c05135682e27e6fa1f4b85003e4a406510d
tree98ae37395e1fc2e81a3802bbc8893c0fc24847b1
parente2c08770724b650dc4674c3b1435568c2cd3ed3e
parent4e77579fb8cc11b2d7762d4c11159e1d578456e9
Merge ... '17f165259b5092d4fb5def6145d429af967f491a'
     and '63916b741165f48e46f4d9b000ec2b036ff1beb4'