merge of '311c27bb2d9d680e9754b77c40e1c0c4c196911c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:37:47 +0000 (16:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 30 Mar 2007 16:37:47 +0000 (16:37 +0000)
     and '5ad501585ca9cad8ed8d9a9c79580304a6f71a49'


Trivial merge