merge of '11f0ee99928fd3f1abcbb6452894ad035ca86caf'
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 22:50:59 +0000 (22:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 4 Feb 2007 22:50:59 +0000 (22:50 +0000)
     and 'a5e5f5fafe980604ae345371946d6043cff860d3'


Trivial merge