merge of '57f7077b81d445e3b77f5f1a68139c49a941d322'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 15:45:57 +0000 (15:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 7 Feb 2008 15:45:57 +0000 (15:45 +0000)
commit4a80af56e67bd1056469bb468afddbec04b8940b
tree6b003f9509b6e09c95267fd35618ae95094fedc0
parent24d1939f49e4e0d72d4caab27146424bee44eb49
parent49e69fde110aee47c7bde8ff2ca584c5a7d12366
Merge ... '57f7077b81d445e3b77f5f1a68139c49a941d322'
     and 'dcb061c2db7bd0edf1205099c9919c1144157b03'