merge of '669bdfc0ca89598b9e5d56d8c2a7df2ad055c0b2'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 23:03:05 +0000 (23:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 23:03:05 +0000 (23:03 +0000)
commit7b416778337822cb65f4510e8122ff3b0bf2fd16
tree0f4292f8ac52a8619cf76bf14ec62fec6f07f9e5
parent17b4e6b62b19a69dda47eee528391b5ac84af67d
parent1c712ee28e5fb57b8bcd154ad3453f15972f79c5
Merge ... '669bdfc0ca89598b9e5d56d8c2a7df2ad055c0b2'
     and '91d8f0c9c1e51e85470236a1a95ad046ba02f569'