merge of '706f1474ece6a6a01e4446a03863512f82c3f4a7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 21:05:50 +0000 (21:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Nov 2007 21:05:50 +0000 (21:05 +0000)
     and '73900e49333ff8602be6bc97757ef21d80d1134e'


Trivial merge