merge of 'b0f78dcf5bc551b7f2052b36b0918b4fb1d1af09'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 May 2008 09:24:30 +0000 (09:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 May 2008 09:24:30 +0000 (09:24 +0000)
     and 'f70831974c48d510c516e91e24192076b405b91e'


Trivial merge