merge of '8390c5b6b9d59cb9aaf655dbe6f2e39726610caf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:30:25 +0000 (08:30 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 May 2007 08:30:25 +0000 (08:30 +0000)
     and 'e7f1b73351ab28d61011332ab47196f1dc6a1931'


Trivial merge