merge of '50e6b56f1469addca3c0756da42f227da6a71b4d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 16:45:14 +0000 (16:45 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Dec 2006 16:45:14 +0000 (16:45 +0000)
commit074466b74d6238510942473c4298283ed756f063
tree559913b31cf343c2a231786c396c63c7c7b191f7
parente4db4e90a0f753fb7345b88e5d2a42ea65f6e1b8
parent60850c4324979bb622d90639b3f31d8ca0b29de3
Merge ... '50e6b56f1469addca3c0756da42f227da6a71b4d'
     and '716dc25622b5d7b692780c2376d47847483c9027'