merge of '8515621d878af9f9ba13e5c5340fd7da893d0666'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 10:46:50 +0000 (10:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 27 Apr 2007 10:46:50 +0000 (10:46 +0000)
     and 'c9156882c7a9571536d48876ec434ff48dc2c80a'


Trivial merge