merge of '261e22bd3535ccf811a14529928bb45c658241c2'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Oct 2007 16:42:08 +0000 (16:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Oct 2007 16:42:08 +0000 (16:42 +0000)
     and 'c18beadc5b113fa9ca28944c4fd379127c3ba500'


Trivial merge