merge of '5076ed26abde44cf0e9a27bb249bb0829b19ea16'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 01:28:52 +0000 (01:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 01:28:52 +0000 (01:28 +0000)
     and '9a0ea0926b71ceec737d423255d8fce2074cc8b7'


Trivial merge