merge of '23575cb366ac6706d85f4cc91b22f06ce1e10a0d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 11:30:09 +0000 (11:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 11:30:09 +0000 (11:30 +0000)
     and 'b14d208c68db08fe1a8827e66c5551d6e362146b'


Trivial merge