merge of '7092ab793b40d9bf0352adda7cb0de9e9d1b53d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jun 2007 17:29:51 +0000 (17:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jun 2007 17:29:51 +0000 (17:29 +0000)
     and 'ed60cd7b6b6312ef6a4497d871d3c2f91ca6b369'


Trivial merge