merge of '877d7e013761ee744293481a1d3675bab891e209'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 16:20:41 +0000 (16:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Apr 2008 16:20:41 +0000 (16:20 +0000)
     and '8e2294c420be84826fda7e7cdab3d6ae13381c82'


Trivial merge