merge of '3c8e3d68719358813ee74a6de4f4a724fd827bd0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Sep 2006 09:07:19 +0000 (09:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Sep 2006 09:07:19 +0000 (09:07 +0000)
     and '9069334d89f0643dbe7a56f63eb0ba9aabaf2a6a'


Trivial merge