merge of '8e267e53f5ff3974ea907c65e0425b4bc3d49be6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 19:55:31 +0000 (19:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Mar 2008 19:55:31 +0000 (19:55 +0000)
     and 'bcbf3f86a64a7efd40e705f7468f43fbe17c6f84'


Trivial merge