merge of '820eb34bc4a417691a71d40bf2d2ae059cf1fccd'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 16:33:48 +0000 (16:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 14 Mar 2007 16:33:48 +0000 (16:33 +0000)
     and '92449623bd54f49417182496d1ad89e697de0505'


Trivial merge