merge of '3d8fcb3e38b76cf853ceee12d6cd8f1d518b546b'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:14:37 +0000 (13:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 13:14:37 +0000 (13:14 +0000)
     and '7d3ee6f9dd094cfa51709c24c15492d19ad64af7'


Trivial merge