merge of '7d9f2813538bd9530788139c9fb3fcb1e0264065'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:20 +0000 (16:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 2 Apr 2007 16:12:20 +0000 (16:12 +0000)
     and '884408d7b0ae3dcb9e1bd3607711aa6d13167c4d'


Trivial merge