merge of '3a89dabf7f758f7d9957d9dfebb5e383d9096d6e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Feb 2008 16:47:52 +0000 (16:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Feb 2008 16:47:52 +0000 (16:47 +0000)
     and 'fe3ce31a0e6060324326d5a27cdba01788c95b7b'


Trivial merge