merge of '063eb0ee158d77c4c6ba8c5ca8b517b3380b0d66'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Oct 2008 17:05:21 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Oct 2008 17:05:21 +0000 (17:05 +0000)
     and 'eda920dfeccbfa68c48217a7ccb00fad8a8a62c2'


Trivial merge