merge of 'b5e8ca9e2938b9d08d831d84eefefa0b5443ab45'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:43 +0000 (10:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 10:59:43 +0000 (10:59 +0000)
commitbee4fd5863fce88b4b8e7a9d7a37d2f6d8c1f947
treeda75d777eb3ca91fca4e9862e2adeb1bc2ae2a26
parent3aefe52f532d621bfad7109bb8f03bcbc32833dd
parentce8dec58012a1dbf2d23455c140acc7b96abe10d
Merge ... 'b5e8ca9e2938b9d08d831d84eefefa0b5443ab45'
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'