merge of '22d706dfbdc70fb305106958f1ac66017d3b64d3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 15:28:18 +0000 (15:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Feb 2008 15:28:18 +0000 (15:28 +0000)
     and '312abdcbb7f1c8b20dcda1dadb8df745c4db060d'


Trivial merge