merge of '0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 7 Feb 2008 13:08:35 +0000 (13:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 7 Feb 2008 13:08:35 +0000 (13:08 +0000)
commitbe3429189fb5eb2c12936f8d568bd8ba7d111ddc
tree3a96cda412e61a886aae321d88c6ed16bf994e51
parent6853e674e42ffa97b62d6354c38d15b075956ecd
parent28fee5ea2a5f032871b989acd23e6c4ac26287e4
Merge ... '0f1b9dcedb4d611ce7ce7ca8935b934dbc44061c'
     and '8dadec7d9f47d3e60f4729a152204227dce39c49'