merge of '19b3553f698a014d63c349b2723f835295c7b5da'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 08:16:51 +0000 (08:16 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 23 Aug 2007 08:16:51 +0000 (08:16 +0000)
commitb6d6e400005ee9a12a5c859609e3cb609c0d8dea
tree0e4b614f33cd020bb7f9e317e6f96be756c74d80
parent2cb53be5d39a4a4817e1464f853d5b0cd038e571
parent1d90efcdbf94571236a9d770af3d1adfb8ced770
Merge ... '19b3553f698a014d63c349b2723f835295c7b5da'
     and '38e2cd40a04ac88008e433a43002415c562145e4'