merge of '0413bc22cd84e097b31969ed4179c1b5ff152b99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Nov 2007 23:55:19 +0000 (23:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Nov 2007 23:55:19 +0000 (23:55 +0000)
     and 'a8532082ddec43c58d47a8c2ed2b6f0d2ef18651'


Trivial merge