merge of '3b746059b417b5f4dac35b18e315cd86005e0bad'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:29:58 +0000 (08:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Oct 2007 08:29:58 +0000 (08:29 +0000)
     and '6eb4738f8e16e760c646d20625cb8c9069e25c22'


Trivial merge