merge of 'e62a0c66711b348417a6b1271840a851d2cf80e0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:12:33 +0000 (09:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 09:12:33 +0000 (09:12 +0000)
     and 'ef4ad8c699f3b3898f4cee8db235217e3afe2bab'


Trivial merge