merge of '360252a7aec7a1e6c96f9b1714b0995b55b94134'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Jan 2008 07:48:53 +0000 (07:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 11 Jan 2008 07:48:53 +0000 (07:48 +0000)
     and 'c6c33aa5d673dccd6d19de32e40edd19565dbb5a'


Trivial merge