merge of '1a4cfa896e213a1c6c15d152c0b570b340bdb272'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Nov 2006 18:50:01 +0000 (18:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Nov 2006 18:50:01 +0000 (18:50 +0000)
     and 'fb8e5228aa3b97342963e6d2b8465122d5c7b801'


Trivial merge