merge of '7fe4c06ce30cce4695a8e59d2e11f23206fd87c0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 16:12:43 +0000 (16:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 1 Nov 2007 16:12:43 +0000 (16:12 +0000)
commit834cb18d8ed17c6667dd6d32b8d0cd4acb288971
tree974377c179ee424c1759a457ccd320426ba27bbd
parentb8d35813e7085c38bc98439693c60d9bafe0b9b2
parente37134d6d75bffba46ff1f187bb3e8cc89606431
Merge ... '7fe4c06ce30cce4695a8e59d2e11f23206fd87c0'
     and 'c7ee16004be313b8918a1fa2f0bdd3b70fa6d398'