merge of '2277b45295ab7dc58f6d8041b5f9288e3b4cc638'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:19:05 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 15:19:05 +0000 (15:19 +0000)
     and 'a57f1e6461c2f62d675d4b6c4eaff3b48e75ebb3'


Trivial merge