merge of '5f80d82b77d53ef77154af1dcd9298bf7c5f389d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 31 Jul 2008 10:19:09 +0000 (10:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 31 Jul 2008 10:19:09 +0000 (10:19 +0000)
     and 'e10700938896fb54483d9c1a8c452585cdd764be'


Trivial merge