merge of '1eda447bcdb08adfa9f20f565bd08e963be86a92'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:15:53 +0000 (17:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 18 Dec 2007 17:15:53 +0000 (17:15 +0000)
     and 'cd255677623e77c45c275ece38db6161300a9766'


Trivial merge