merge of 'b7543cd2dc462a6eac2d07da5b8a046d889abacb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 17 Jan 2007 20:38:02 +0000 (20:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 17 Jan 2007 20:38:02 +0000 (20:38 +0000)
commit7c1df3e2615df450f968c1b677011ba8d9c17b0a
tree20725764a3a3aa71bced4833ff55b6483573f322
parentd14bedf242c95183dfdaeaa5ec8a06a45ca18d26
parentae6b880bc785a04119f3db1184ac615e9d92665b
Merge ... 'b7543cd2dc462a6eac2d07da5b8a046d889abacb'
     and 'cc2d03ff9706820f2a9118101188cf7e270a188e'