merge of '2d574b396363dc4b0725e8562582f359dc3f9e9e'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Sep 2008 14:00:39 +0000 (14:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Sep 2008 14:00:39 +0000 (14:00 +0000)
commiteef34c2e56094d0485949e80b7909a0e76038af9
tree5cd20a3a7a66d878d920d9980ae06303570a46e2
parent2261f191b0333d5a31dbd0fae70047616bfbe94d
parent0cca56e0c65a4d32e49ca726181f28759cac9a96
Merge ... '2d574b396363dc4b0725e8562582f359dc3f9e9e'
     and 'dfb479cddb09f499a866399e04bdf6015048f98a'