merge of '2d574b396363dc4b0725e8562582f359dc3f9e9e'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Sep 2008 14:00:39 +0000 (14:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Sep 2008 14:00:39 +0000 (14:00 +0000)
     and 'dfb479cddb09f499a866399e04bdf6015048f98a'


Trivial merge