merge of '5bb8dd4df9a12509e1f1ff695bf5e3417da6ace6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 09:36:17 +0000 (09:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 09:36:17 +0000 (09:36 +0000)
     and 'eba154367679f74d07e194d2995c74b2810109a2'


Trivial merge