merge of '212ab031e33707ab289fca4bc893d1f946e6f8e6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 13:03:43 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 13:03:43 +0000 (13:03 +0000)
     and 'd935cd87c7c9021470bafc4d24b4faafe4d6c58b'


Trivial merge