merge of 'c80d3d5fe446b4ab1b902de2706822e04b306ab8'
authorKoen Kooi <koen@openembedded.org>
Tue, 13 Feb 2007 20:45:16 +0000 (20:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 13 Feb 2007 20:45:16 +0000 (20:45 +0000)
     and 'dd511be6577324f0680f20fabc392b0941182942'


Trivial merge