merge of '179df98f22edaa74332b35d2b383a55ecae7f2ba'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 11:13:38 +0000 (11:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 19 Oct 2006 11:13:38 +0000 (11:13 +0000)
commit7c99464aad7bac74d062566cd7b70fe90e5a715d
tree70c6253bfd04e213167c55ebf9c0d1c097e25d9d
parentf41065daa4e7ccdbfde60945e1340617215ca14c
parent8d4f949be4d1c5ba0bdd81f9bf0426d7c70e59d0
Merge ... '179df98f22edaa74332b35d2b383a55ecae7f2ba'
     and '95790f96b79f6c36ad3f1f583d73e9d450736479'