merge of '2a44f6283ca97f8f5d3a7e5075008a46aaf531fb'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 13:44:42 +0000 (13:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 13:44:42 +0000 (13:44 +0000)
commit8dec57b109f4fe419b538cdb23dda8368d5ac92d
tree0882c07a509382e72a5c12ab2f4e934968c50fff
parent26002eb291c8dc2d393ddf3afaa392cfd69e1452
parenta3d194ad936945a8712c8346c6f474f176f2b37c
Merge ... '2a44f6283ca97f8f5d3a7e5075008a46aaf531fb'
     and '52d9ae7d2594e31289d20d8dbe1bb58be3c26a82'