merge of 'a5ceef80167451640ed57234e28008169c49ef38'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:13:56 +0000 (19:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 27 Mar 2008 19:13:56 +0000 (19:13 +0000)
     and 'c6d6222ed4db4cbb388138ad85e72ecd5dcbda73'


Trivial merge