merge of '0ff7b192e1f386a42dc2619236091fbae7c94f27'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 11:55:14 +0000 (11:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 11:55:14 +0000 (11:55 +0000)
     and 'f26d698029356f75985aa3a48399bc7aa8f08144'


Trivial merge