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)
commit206a23724ba99ca1cfb6e22a756f7cb698ef63de
treee59c9af07d75935d9318e8b2b1819f8b941236a4
parent295f0eb481ce73f976bc46031fa33551375d77cf
parentef0916b547e87abe7f5fb80fbba8273fad7de3c5
Merge ... '2d89d48451ccb04cdcce8533e88ab183e6fd5bbc'
     and 'd7c8a05b1dc7e5260900eea102e2e2aa5202e740'