merge of '53d64b20113c9b23a5d4825ba78e6facd2a1a506'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:19:23 +0000 (18:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:19:23 +0000 (18:19 +0000)
     and 'a28fabd7fe7ef37dfa0b2ed9b500e579b1034bc8'


Trivial merge