merge of '0a9f13e573f898d652f74fb5614964dd53e3ff46'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 28 Sep 2008 18:44:40 +0000 (18:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 28 Sep 2008 18:44:40 +0000 (18:44 +0000)
commit17798617669f23548a46c4263b41a47b8eae2faa
tree83bc95334cc58b2d12f065ae51ec9ca55d5517c9
parent001012e9df8a01975b0d69e7d069d8e9429424d6
parent171bc5c067cefe8ece060ae11506133df9ed64ae
Merge ... '0a9f13e573f898d652f74fb5614964dd53e3ff46'
     and '84184cc683b97b9e1637721ea024604a13d90609'