merge of '9767e2c8632f709640f3b42264030553c9906cb2'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 14:39:19 +0000 (14:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 14:39:19 +0000 (14:39 +0000)
commitd7dfc967e7a07c6adecde410fb91a24b1a018496
treeae7095c65130984260102f930c23d86ba7842d7c
parent8d3d48b239e4c7b31abe321ea072aca0b6eb6750
parent139a944da84d474945df0e2c49b6c4fdf3a82c3a
Merge ... '9767e2c8632f709640f3b42264030553c9906cb2'
     and 'c21c001cf452d0c8ffbe2041880be4d68d0fdec9'