merge of '6686ff23579d58fcc1cd77385b2f7dab97200433'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 12:26:22 +0000 (12:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 12:26:22 +0000 (12:26 +0000)
commitca31ea0d011898a311a229fffec024a03b63598f
tree89421271bdeddd31d87b85b66fecf02998904ca2
parent5534547167eefbb3eac373e55a1b45600b6d9a99
parent3afdbd34370351cb3833ee3e70799517ce9e9d41
Merge ... '6686ff23579d58fcc1cd77385b2f7dab97200433'
     and 'a4d4654dbba442a770bc9686a79cb078180ead5b'