merge of '2dedd269e3ce065dd32e2397e0e647b83f2a26ee'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 17:18:32 +0000 (17:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 17:18:32 +0000 (17:18 +0000)
     and '3b9a62d13a4d7a58079179c6df892a56648121f5'


Trivial merge