merge of '8ec01836d59cebe05395b5dab405fb4b2839d7b7'
authorKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 17:48:50 +0000 (17:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 27 Apr 2007 17:48:50 +0000 (17:48 +0000)
commita653af3f1191529e083aa5b84d74b91cf5c4b199
tree37ee4252a92946be929d710bd63efb3322269084
parent9a69bc4f498844e84d1311f3c6ca9bd4efdff319
parent72285c964d0bc8f59975228136f006cb80eb8eae
Merge ... '8ec01836d59cebe05395b5dab405fb4b2839d7b7'
     and 'b610299826648469b3d71e42e60bdf8bb88e8c08'