merge of '76a1c51304038a511d0105e6d572f83c0a52994b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:34:51 +0000 (16:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 16:34:51 +0000 (16:34 +0000)
     and '859e2ad80476c0c2a7333efae72e37c9a644472f'


Trivial merge