merge of '399ad82a65eae57d617ef7178f450016dcc3c1da'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 12 Oct 2007 13:40:29 +0000 (13:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 12 Oct 2007 13:40:29 +0000 (13:40 +0000)
     and '5e7921c266d5822c71d7e845436f0c477d53892e'


Trivial merge