merge of '242a466ed405559b9394dbf1b3a8678ba25cf86f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Mar 2008 16:19:10 +0000 (16:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Mar 2008 16:19:10 +0000 (16:19 +0000)
     and '728bbddd3caaaeb9c83d85b9eb213042e12070bb'


Trivial merge