merge of '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:01:56 +0000 (22:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jul 2008 22:01:56 +0000 (22:01 +0000)
commitfa689e0c15fc06d6893f8263bd298f4a09058bf1
tree20dfcf02b3f4a0e9d452ce35efe9d60da0c7b578
parent7b93a615d39e272bb87d7ed92340708d7f6d53f9
parentbc2481e0171b6610ce992c18bc6e03823bfa4d8b
Merge ... '0ad423d3482b73008fa7b39e78b0dbc3658cbc50'
     and 'a9043ecc52370e4ecf1fd689e40cf12dac122cb9'