merge of '5b67d1cb3227253f3f4b525375b174d391b45a4a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Mar 2007 14:53:31 +0000 (14:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Mar 2007 14:53:31 +0000 (14:53 +0000)
     and '8b675ccc53dfab5cb741e302ba279dca3cd6cf5c'


Trivial merge