merge of '1ba9df24f1f8128a61ec636e73db71360782f1fc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 8 Oct 2007 09:25:06 +0000 (09:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 8 Oct 2007 09:25:06 +0000 (09:25 +0000)
     and '1d14c551bc1dbe1ac63e66db38db383600d6a812'


Trivial merge