merge of '3620da360f4c3047638547a32ec53f597dc16e88'
authorKoen Kooi <koen@openembedded.org>
Sat, 1 Sep 2007 20:17:50 +0000 (20:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 1 Sep 2007 20:17:50 +0000 (20:17 +0000)
     and '9bb287f6e7dc270c87e574dd4fceb90b60a065e0'


Trivial merge