merge of 'ac74fcc2453aa7482b87f6c60813db2ff346f849'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 09:42:19 +0000 (09:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 24 Aug 2007 09:42:19 +0000 (09:42 +0000)
     and 'd856396130f5cff8cb6cb3913650cd3132574135'


Trivial merge