merge of '1bb95c93cc0333355720a49f6933cddc3e57fc7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 09:58:32 +0000 (09:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 2 May 2007 09:58:32 +0000 (09:58 +0000)
     and '54c79c3345238c5d9b19bb64d60aa8a01ab471a1'


Trivial merge