merge of '27da4e71e0cfec0f89680d407ee1de218f47d599'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Mar 2007 11:19:55 +0000 (11:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Mar 2007 11:19:55 +0000 (11:19 +0000)
     and 'baa52bc73475b541acb6e71c042079c52be8330c'


Trivial merge