merge of '9f224874c5f8a4b528342f4a9ad8489d28b2a201'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 17:20:33 +0000 (17:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 17:20:33 +0000 (17:20 +0000)
     and 'c017d62785b5656a6d3deda474d3cdd5086c4c36'


Trivial merge