merge of '4fe495c9a4ef398e11ec8bc90de91ce7a9a94c3d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 17:12:08 +0000 (17:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 13 Oct 2007 17:12:08 +0000 (17:12 +0000)
     and 'ba74774ae8f7988d8fb8f6cfed387fe5b46af7c0'


Trivial merge