merge of '4a084d17d8150e500fccc6f78c116ab863359656'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 20 Dec 2007 13:46:39 +0000 (13:46 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 20 Dec 2007 13:46:39 +0000 (13:46 +0000)
     and '634115f7cb55bed1cb0ad082cb66c596be1b6d40'


Trivial merge