merge of '1881f1e08c19772afb57e141b8e9cfe8a3308a4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:10:41 +0000 (16:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 11 Jun 2008 16:10:41 +0000 (16:10 +0000)
commit57cdf6b7addae3ebc0f825343958ce8238c86be3
treedec2889867ef1d11a9336a7f03a25d46efffa4ac
parentf4c000b83ea9942d30cdfa7c54c14d74e489e422
parent0ea2a3eacf6bd7f2bd8be28db697fa3c6c8fb2dd
Merge ... '1881f1e08c19772afb57e141b8e9cfe8a3308a4a'
     and '72c0842d7283ea3030501853bf33285caffa427c'