merge of '0875295cfaf1e52bac06fb1893be0b5b76fa21ee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:30:01 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 28 Jul 2007 18:30:01 +0000 (18:30 +0000)
     and 'b3780b3bcc2d7109f1194e36e18555a331e2d8ec'


Trivial merge