merge of '0cfef0fdcd39ce49077acb4218058948a07ba70f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 14:42:37 +0000 (14:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 14:42:37 +0000 (14:42 +0000)
     and 'e60a36ce97927c0d8ad36cace5dc291638e20694'


Trivial merge