merge of '2601e7ef59afcc83010bc4a599716c775a867e2e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 20 Dec 2006 13:41:22 +0000 (13:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 20 Dec 2006 13:41:22 +0000 (13:41 +0000)
commitfbbf08bd5428308ad377287748883996a773b1e7
treed5b2fef4a79a4bff09fd8ad23edf0990142936a8
parentf8802750ea8b07879d8ebb4eed329e7a468a134a
parent24b5de89da4f45465f88dada33d6563a96a5659f
Merge ... '2601e7ef59afcc83010bc4a599716c775a867e2e'
     and '2cb095a37f96f3f076129401bcf32c8ad04a340f'