merge of '7f7ecaeecb75904bd446276f156340f12b4213c7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 22:13:14 +0000 (22:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 17 May 2008 22:13:14 +0000 (22:13 +0000)
     and 'f4fc6d5b07cfbbf0922b31fa7a5f3163c120543d'


Trivial merge