merge of '1413d095164c683305cfc29d3e275c6cd0aff5c2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 20:33:45 +0000 (20:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 29 Sep 2006 20:33:45 +0000 (20:33 +0000)
commit3123faca484adb68e0bb77de716b00024a82f086
tree053de84a76cdd4a172d5166355405e51cfe44a49
parentfcfd06f1b5a0bea5854a50545b3fc102307d6df5
parentc62509d5242fcec2865b0115aae60435239db294
Merge ... '1413d095164c683305cfc29d3e275c6cd0aff5c2'
     and 'c08c1b4bb94a697cdae713e266562bb43944ba77'