merge of '24e6547fb1a547a4930278a58e0636a8d40f93b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:47:44 +0000 (10:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 1 Mar 2007 10:47:44 +0000 (10:47 +0000)
     and 'c3e65881a9b8df367e00858413c2fb4af7439f7c'


Trivial merge