merge of '8e9358ba32e8e49147324d9632bc8d1a27433a5d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 18:48:19 +0000 (18:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 18:48:19 +0000 (18:48 +0000)
     and 'df4a3a852ea0d6186f4b67d34c4166ca14987320'


Trivial merge