merge of '3b51ced2ab6352c3aa1358c560ebf030e37a0f3b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jun 2007 18:07:37 +0000 (18:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 16 Jun 2007 18:07:37 +0000 (18:07 +0000)
     and 'b9511657e9fa0254ec10af333b56841e7c0f6cc0'


Trivial merge