merge of '6a0bfe7d7f1e6ca611514ff0861ebfa76ea062f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Sep 2007 09:36:18 +0000 (09:36 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Sep 2007 09:36:18 +0000 (09:36 +0000)
     and 'f3c601a77595a1ec641680720217a08492202fba'


Trivial merge