merge of '26da1e390ef5f5b958b6660965006568272d8f67'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 18:17:09 +0000 (18:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 18:17:09 +0000 (18:17 +0000)
commit95b72ace096bafa94249fe009ebf600fa5171b75
tree34f3b60ae0bb935a516d48d354fbf4e243e3cc8e
parent343294a8ce0d2d53087f4e3787192cb9245fe08d
parentfcd086a5a759ca9bc38aa0ac6503f82d617f0a56
Merge ... '26da1e390ef5f5b958b6660965006568272d8f67'
     and '4e8627d0e74554ef7b775c83e08f37f0fa0921a1'