merge of '36133f7d8e7f5d20b7036c64abff8ec2452f0282'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 08:06:48 +0000 (08:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 08:06:48 +0000 (08:06 +0000)
     and 'cec9ba770f42c95b32a71550f948c06c6fdf7e48'


Trivial merge