merge of 'b873786ee35b1f62b5c333fe362ee5964ac4b2db'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 15:53:17 +0000 (15:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 15:53:17 +0000 (15:53 +0000)
     and 'd21d59c6a78079e1c4a6449b93e9afdf358e7a6c'


Trivial merge