merge of '1494fe26d3240d31000724d1c5a00aaf8566b48b'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 10:00:31 +0000 (10:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Jan 2007 10:00:31 +0000 (10:00 +0000)
     and '28548b0eda864e1b3a44136bcced77ee8c1e9dab'


Trivial merge