merge of 'd5ef312b0faed11ba62349c815d78a69319b453e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Feb 2008 02:29:14 +0000 (02:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 22 Feb 2008 02:29:14 +0000 (02:29 +0000)
     and 'fc64da1c43e18d5cbd1d8bc4d76ac91ec70ca5cf'


Trivial merge