merge of '630d91b636d9eb5ff3634efb7f7ed911fbd36602'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:53:53 +0000 (11:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 11:53:53 +0000 (11:53 +0000)
commitd9b583873f4ee669a8576c2fbd3eb8ed70df6189
treebb391191353bae03ff00211caa5925da49ca418b
parentf1d0d79f48ab191a1ed0b5065e39046e1d95fef4
parentf4c65cbaa1fe07d8e9d833a74afcd6812e246ba7
Merge ... '630d91b636d9eb5ff3634efb7f7ed911fbd36602'
     and 'e0613a176614c74d38f49dfbdb46b6f368ef64ca'