merge of 'c827a7afadeb81d1fe48c8ea8c9a4b0deb619d3d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 15:07:15 +0000 (15:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 15:07:15 +0000 (15:07 +0000)
     and 'dacf750b2194987a8f9d9c98336cbca888ed01e0'


Trivial merge