merge of '24cdf00497026255c1422d0d98d36a28dd10d85d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 23:33:53 +0000 (23:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Feb 2008 23:33:53 +0000 (23:33 +0000)
     and '541709cbb3711ab39533225ca8717fb5f9bb49c7'


Trivial merge