merge of '4c917e13bc231f8325cbb2478d7907d3ccc3f75b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 15:08:45 +0000 (15:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 15:08:45 +0000 (15:08 +0000)
     and 'a8fa0920a4e1dd5e47ce36f4fa80c505684b4c46'


Trivial merge