merge of '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Mar 2008 23:09:10 +0000 (23:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Mar 2008 23:09:10 +0000 (23:09 +0000)
     and '8a98b05914e98533aa6ec6041337074cd4a83fe6'


Trivial merge