merge of '003d5589c32126d84385935351087e649339386a'
authorKoen Kooi <koen@openembedded.org>
Sat, 9 Aug 2008 07:03:35 +0000 (07:03 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 9 Aug 2008 07:03:35 +0000 (07:03 +0000)
commitb086431a37f108ebeebc83b77f8100d746739a27
tree0fb76051478086dcd66da792d630b055bbd7c825
parent19d7a70af1f98b1e498930d522c31910b0662799
parente9938336c173acad89726fa60605abba7c23d57f
Merge ... '003d5589c32126d84385935351087e649339386a'
     and 'faac6daf1f748c6f7109cbc33bb0af2fbe932c77'