merge of '80e71d36ec321be9cd506e086c7f71856a768989'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:44:25 +0000 (10:44 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:44:25 +0000 (10:44 +0000)
commit53d34b41a2d30b4b8d1d3bf1bd9fef2b8462a145
treebb03b85db60dba9bd9fd9a41209916f1998191c8
parent994d2692779a49840c5bd1c4796c45944462c13f
parentd49aa984dfa45e53c2ca1d62d3e772efb18ae7a7
Merge ... '80e71d36ec321be9cd506e086c7f71856a768989'
     and 'ab0d9a488e49d9ec307f6d034845a25a157b066b'