merge of '239b4232a0af35c5c04016055fb9696c66213993'
authorKoen Kooi <koen@openembedded.org>
Fri, 23 Mar 2007 12:46:20 +0000 (12:46 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 23 Mar 2007 12:46:20 +0000 (12:46 +0000)
     and '7c52437404c05555219a1ddce7bb0a7d5cefa5d0'


Trivial merge