merge of '5c6bd9229c2912167e04e747499aa015e936f86e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Aug 2006 11:15:20 +0000 (11:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 23 Aug 2006 11:15:20 +0000 (11:15 +0000)
     and '99d4c960758f8db7a224500ef5d1acd1663ceec0'


Trivial merge