merge of 'a5d35e3e38233fd826ddc91736038e0e93f9ee84'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 15:23:17 +0000 (15:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jul 2008 15:23:17 +0000 (15:23 +0000)
     and 'b6c0786ab5d67f257974d8b40c940fcb2be0b6e8'


Trivial merge