merge of 'b25e19744697afbbde21b5770c7d4f474f5c201b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:58:09 +0000 (14:58 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 2 Aug 2007 14:58:09 +0000 (14:58 +0000)
commit0f8d2f94ea9b713f9de60f489e463ccdec9f56dd
tree1693a3657fff7613905660886ca6c636073549ce
parent589856652663573265fc023874c77fa0777a558b
parent710d0c3d0d686d309cbfcff348e98dc5613c4785
Merge ... 'b25e19744697afbbde21b5770c7d4f474f5c201b'
     and 'fee382780bcf6b27faf2e00fc0272280e1e9d147'