merge of '15e4e8f4f0911b6d7b063f78ad573c2face554e5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 18:22:36 +0000 (18:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 May 2008 18:22:36 +0000 (18:22 +0000)
     and '37205cd40f454a7b0819444bcb831e91ac8161ca'


Trivial merge