merge of '0cb8f2ce480fcc07aa6c28de994811e8b223d81c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 11:44:27 +0000 (11:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 8 Apr 2008 11:44:27 +0000 (11:44 +0000)
commit08cf42edb2486b63ef21fa13bea013b97a360dd1
tree8856aed44a709c5a2164c970615a86ff5d7a1fff
parent09594b3c026affa4c8fc3a06ddb4155744e2cbf8
parent7e995cd1f0d0ed236477e616178e88f3e781ac4d
Merge ... '0cb8f2ce480fcc07aa6c28de994811e8b223d81c'
     and 'e32e0321deebf52172fbb0d967704f72299ab0c1'