merge of '7370b7cb2be2fee991acda2f9f3376b3f7b46a68'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 07:56:44 +0000 (07:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 07:56:44 +0000 (07:56 +0000)
     and '8b47107ec4e62cba68868b4e79de81c71361255a'


Trivial merge