merge of '64b4c8fe4237a26afc063affc6aa1633bea9dba0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 14:12:48 +0000 (14:12 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 6 Feb 2007 14:12:48 +0000 (14:12 +0000)
commitc9b1cbf7633375ccc817bceafe669068be7c246a
tree6af9ceba7d16b29ac921a9f6432b44edc343533e
parent28dfe9097241db9d7374dd63204dcc1cec27509e
parent39dd5539dd04cdf07f8f851854e6cae8e6d8cd2e
Merge ... '64b4c8fe4237a26afc063affc6aa1633bea9dba0'
     and 'a4aac9c855570e5ac7a83f7c0536235ba0bbdcaa'