merge of '339d8c23276df48d5bd47404a5a8da2f987f0713'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:48:21 +0000 (14:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:48:21 +0000 (14:48 +0000)
     and 'a280ff075699a8837095830f4f486c8493cead58'


Trivial merge