merge of '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 4 Aug 2008 11:02:46 +0000 (11:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 4 Aug 2008 11:02:46 +0000 (11:02 +0000)
commit9d8c327318a4f6b00e712fa0776694fb73c62577
tree2913602d90e9506acb321e9214e77e98b450bd7d
parent2b30dffed71d78a8d26a31539c85beb38ef5f75a
parentd371e2c69b107d2949d640df221405306e6a40f5
Merge ... '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
     and 'b68ae87d8ee0969bc8a91ea0ac326fb34c5eb9a4'