merge of '12e8362ccf0740454595721a242cfb8e867eb512'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Aug 2008 08:02:24 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Aug 2008 08:02:24 +0000 (08:02 +0000)
commit0cedbe2307e9309c1de41a9eaef5876226753017
tree1ff3c38613cf46e26ae67edebe9e7c9fea7145a5
parent3aba955b28d6209ec2e3cf50316bd74db6817914
parente2b02623bec301743ef037687d1bbbf9bd87a778
Merge ... '12e8362ccf0740454595721a242cfb8e867eb512'
     and 'e7f394edea22558fdbcb02929f1540784a5265f2'