merge of '56aa1dcc42a7cad6e25739df3ce7c61c3112220e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 20:26:39 +0000 (20:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 20:26:39 +0000 (20:26 +0000)
     and '9f32f339a78f7aa0d5fb0c8d6d2a45e3bf7602c6'


Trivial merge