merge of '5f8e2fb083d5b8b890fa66425a21fcce539d65ef'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 18:02:59 +0000 (18:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sat, 2 Dec 2006 18:02:59 +0000 (18:02 +0000)
     and '7aedd4ff460b16cce3273fd31ead110f66692fc8'


Trivial merge