merge of '355866fda3e7098f7d30f22852c4e3ad5145126b'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Aug 2008 18:06:36 +0000 (18:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Aug 2008 18:06:36 +0000 (18:06 +0000)
     and '5ad8db39f892a4c9b9c381f015e9709e5cd01b4a'


Trivial merge