merge of '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Aug 2008 09:03:23 +0000 (09:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Aug 2008 09:03:23 +0000 (09:03 +0000)
commit8e49acfb489180f3e9563202194ba633c84b3a4c
tree941a84784cbfa47113956c39003cbeb9e3448d2a
parent8806f1ab1c61be5d749f8788be3e66f73f8e5c79
parentaa12068c841cac5509cea075f0ad65a4cd3141b8
Merge ... '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
     and 'f51fb525f916aeb12bcca0e4627daa0b3888de81'