merge of '9ffaf3c87a0ed022e4d1a5278dd3fa333a996305'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:26:51 +0000 (11:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 11:26:51 +0000 (11:26 +0000)
     and 'c6e16b4a6d0e111359e2359ddc437db8a41fbd3a'


Trivial merge