merge of '0425e652c6eebc54317f6dcfa596f669e0e8b24f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 07:12:27 +0000 (07:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Feb 2008 07:12:27 +0000 (07:12 +0000)
     and '4f9025ffec7033b44bb7e17c4198f016102c0b09'


Trivial merge