merge of '32c3532162bccf620b7b8cff0f98f92a1f519b3a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 11:54:07 +0000 (11:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 11:54:07 +0000 (11:54 +0000)
commit992a5c371be78fb70941c96053c58ae1b05a4977
treef1db6bdf82195a30104f60e410fa4450b0a0f74d
parent27254ef091ddf921448eade021b620ebd9a8fc50
parent1d0ad602b2a9ccc30d87a7bcf5cf4c01fcf6c188
Merge ... '32c3532162bccf620b7b8cff0f98f92a1f519b3a'
     and '572f8a9e138fdfcf2db206180ca705b00b696a64'