merge of '2d89d48451ccb04cdcce8533e88ab183e6fd5bbc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 31 Aug 2007 08:19:42 +0000 (08:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 31 Aug 2007 08:19:42 +0000 (08:19 +0000)
     and 'd7c8a05b1dc7e5260900eea102e2e2aa5202e740'


Trivial merge