merge of '6751c33f46b4e65f3b35180979c5046f64ffb938'
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:36:49 +0000 (10:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 21 Jun 2007 10:36:49 +0000 (10:36 +0000)
     and 'f5d5ad96ac7c6449a62ad6a934afb8a2659519ed'


Trivial merge