merge of 'a84c8b1ac7e3ca6f6ac526d280e86ab5460818ca'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 08:37:07 +0000 (08:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 08:37:07 +0000 (08:37 +0000)
     and 'eb0ba139c0c43e2c9ccd77ef5f9aa0fa4b9bab6f'


Trivial merge