merge of '230251372ae3b661dbbc35952d8e8514a1af2862'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 May 2007 17:11:30 +0000 (17:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 May 2007 17:11:30 +0000 (17:11 +0000)
     and 'd9bdc4e291d6140a14021f209f3e3c2c07f7ebd9'


Trivial merge