merge of '9b6cdd024207fb27c1273c341b1610c554f948e9'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 21:40:17 +0000 (21:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 21:40:17 +0000 (21:40 +0000)
commit0e928431640f4558976b66959ccc85135d38f614
tree0ae5bf185ba08aaa80925c93e89691bb6254b8a1
parentd629defa6abdfa1e44f4620f73c8e77dc0e92fa4
parent6a4c555f46c4ddcf24732b97590889d37d554780
Merge ... '9b6cdd024207fb27c1273c341b1610c554f948e9'
     and 'a8e71f07bc5697f18dc65c9774d84f92706d66b8'