merge of '331c796786f820575978cca1b06ff1676cbbfb45'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 20:11:40 +0000 (20:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Sep 2006 20:11:40 +0000 (20:11 +0000)
     and '727e71965e5388b1cca1ae5bda4b54f7cdd317b7'


Trivial merge