merge of '1d43b066145d51036ada398df009600d2e861364'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:20:28 +0000 (10:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 3 Jan 2007 10:20:28 +0000 (10:20 +0000)
     and '91d610fe22ec5f30832680d42abf443bcd99fe6c'


Trivial merge