merge of '013b42d9a596e92a85b2c13b49e8ce89c99c1b14'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 29 Jan 2008 23:41:05 +0000 (23:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 29 Jan 2008 23:41:05 +0000 (23:41 +0000)
commitb11dc501a79f39bd62dfc60dbbccfdbc58828436
tree1dc0720e56d90fa5dcd664404131a4d2c93688dd
parent1d7653a4040c77cc803a5e0cb5aebc824a66d58b
parent2bf6b598ca6d64d572f51e7d30fe5487da731087
Merge ... '013b42d9a596e92a85b2c13b49e8ce89c99c1b14'
     and 'a1e797708c3d5dd33d64905da2c778fc015eac9a'