merge of '32e15a2c3c11153e8886b20192817c1ff773b323'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:58:54 +0000 (23:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 23:58:54 +0000 (23:58 +0000)
commit98c5a9cfc78a6acf632f2294d5e9cbd3e1226999
tree41db9e3d41dc44d29a2e2b2f10bbfcbed3e4e5e0
parent7fb329846094594477900e9a4908b902cd13aa33
parent6cee5541f20753d5101c0cd30b4811e14e0de237
Merge ... '32e15a2c3c11153e8886b20192817c1ff773b323'
     and '5ecfc6cd9727453503405bbb7de81a74344de218'