merge of 'af86a1fd345d2e344f7ade9460024f19319d09cf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 14:58:59 +0000 (14:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 14:58:59 +0000 (14:58 +0000)
     and 'f6d103c98aabe04b32d3cba8cf288cff1f5ad67f'


Trivial merge