merge of '309e33d0dffe90b672817f37e57ed736d1f9672f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 14:04:59 +0000 (14:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 14:04:59 +0000 (14:04 +0000)
     and 'efbc6b44ed8a82418c052ce81b199d54d7f6c831'


Trivial merge