merge of '1d187fa547c16ed9ca31c2975f54b8812e88b0f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Feb 2008 09:40:00 +0000 (09:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 21 Feb 2008 09:40:00 +0000 (09:40 +0000)
     and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'


Trivial merge