merge of '56ae59ea3e6391be0130df66270147e0cbb86d32'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:57:35 +0000 (14:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 14:57:35 +0000 (14:57 +0000)
commit2e6da7164ed1034b8ab01e91759402812753b92e
tree7b200a8017b64a25beec4c0c9216f7319fec7c4f
parenta95e0d2f5471d006422a26ce4982d42f76b53b74
parentd8cad41d92b08997af3cf390467ad360ebc55c5c
Merge ... '56ae59ea3e6391be0130df66270147e0cbb86d32'
     and '7129200468ce50196cd24e59a5bbb32bb2437726'