merge of '9baaea2c747482336eaf77e055c74f2f21596957'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 06:06:21 +0000 (06:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 06:06:21 +0000 (06:06 +0000)
     and 'f74141b6df53f890c26db2848828471f337744ac'


Trivial merge