merge of '136745c1fbac40dee1623f707a662275abae9a7c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 11:52:46 +0000 (11:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 11:52:46 +0000 (11:52 +0000)
     and 'fef3069502758e3e525ba100fb180bf19f383f66'


Trivial merge