merge of '4fc5395fabd4b8f4683e87c37d128006893e7282'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 09:51:26 +0000 (09:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 May 2007 09:51:26 +0000 (09:51 +0000)
     and '538b8a92adf30fc2607a93bc9b05dd896bd35712'


Trivial merge