merge of '705196b2d72ab98805eba68c1d18a11b85c6d56f'
authorKoen Kooi <koen@openembedded.org>
Mon, 29 Oct 2007 10:33:46 +0000 (10:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 29 Oct 2007 10:33:46 +0000 (10:33 +0000)
commit227caa1ecb4171aff59d2b8e6b6be82aebc596f8
tree64ec3ffa754cf437f0e0e6fd87487da43fd7c43d
parent0217332233ed282bb5a3e824871f49ca28a2a281
parent573529fd2141d6de15877b65e1e0c98fe6a245db
Merge ... '705196b2d72ab98805eba68c1d18a11b85c6d56f'
     and 'f8274b21ad6717d64b836fe0752d337715f16e82'