merge of '2516927691cb7bcdc148fa4797baf97a39ab6b0c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 11:56:55 +0000 (11:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 11:56:55 +0000 (11:56 +0000)
     and 'e969264b78652c9f002dfe005ae2a8924f4aa450'


Trivial merge