merge of '10ff7a617b3c5cbe78b0c05c1d0b09006a1c44c0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jun 2008 09:43:50 +0000 (09:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jun 2008 09:43:50 +0000 (09:43 +0000)
     and 'e4d84a69982a5a0ca8aec781cee663743ca6d6fc'


Trivial merge