merge of '4bcc58df36a42d42f015e83b62aa23359cec18c5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 18:47:38 +0000 (18:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Oct 2007 18:47:38 +0000 (18:47 +0000)
     and '994d1b5f0a7e6db282da08fee2a9b3e4e0a52d0a'


Trivial merge