merge of '86b0497d4fe52237e4f52c1f3b0086f931a8720f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:54:12 +0000 (10:54 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:54:12 +0000 (10:54 +0000)
     and 'a9d5f0dcb0f1b73518569a304f263ac4f3e2819a'


Trivial merge