merge of 'b1155dadb6ffc45920e64fbaa89240ba5c7fa0d4'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 15:55:56 +0000 (15:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Feb 2007 15:55:56 +0000 (15:55 +0000)
     and 'f6878aab9639c583f635cdd6149b4aee8f86cb50'


Trivial merge