merge of '79480b22471a1e33c199dca94abfa313f4bd0127'
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 12:06:30 +0000 (12:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 23 Aug 2007 12:06:30 +0000 (12:06 +0000)
     and 'ad30a8ff6fed36a655dd5ba0014a93623be4937d'


Trivial merge