merge of '5c1ed62467a4b699ec7940179d22e83acf36ad4f'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 18:19:17 +0000 (18:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Jan 2007 18:19:17 +0000 (18:19 +0000)
     and '7ac3268bfbc5039a8aba9b5db44344ebfaa1f59c'


Trivial merge