merge of 'ac891e557582299a2c482837fc1a4741608997eb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Apr 2008 00:16:45 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 7 Apr 2008 00:16:45 +0000 (00:16 +0000)
     and 'c7dd0d08fe79367defca06f3c2108b3dae4fead1'


Trivial merge