merge of 'f537311d9440fd345dc036915c31a41292d8e978'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 16:39:10 +0000 (16:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Nov 2006 16:39:10 +0000 (16:39 +0000)
commit32e54b21485668cb3c388a197bfc8815be89f8c2
tree640b691441f51a0e4eebace48ff6734ff59c2e19
parentb8284528d2b7592db25da655b4e41d6d26811c9f
parentd2eea0a154489e6c3f6244f0025924cb9fbbfb13
Merge ... 'f537311d9440fd345dc036915c31a41292d8e978'
     and 'f93795c41ed1896ee6ca1fce9cf1a78b7d95b18b'