merge of '7da15dd442647956379d156f938fbc66c4db5251'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 13:44:32 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 13:44:32 +0000 (13:44 +0000)
     and 'fbf6625ada3dc98b6ca6bf3250baa56f91b08e87'


Trivial merge