merge of '0d25e98bdf0c1d029587a346db9cb19346e4c78c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:15:17 +0000 (14:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Sep 2008 14:15:17 +0000 (14:15 +0000)
     and '24fd9b0c38a6b8e16bb8f4d92f03a041ab500e9d'


Trivial merge