merge of 'bb8fbe01b0ec479cc2c248dbdbf80b35b77226f3'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:53:50 +0000 (14:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 14:53:50 +0000 (14:53 +0000)
     and 'c1f653cd19069cdecd2aea81867ec8e2a5ba68a5'


Trivial merge