merge of '4699a5e1d4242bae2ec7ffb11bfb87bd49e92de6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Apr 2007 14:26:05 +0000 (14:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 23 Apr 2007 14:26:05 +0000 (14:26 +0000)
commita8551c1c7552d496c7d74a80d833de23d6df1267
tree43da758b9fd07394288fdc148a5dcda3beabbbcc
parent81654790f772904aef4021434d4f97febd4199d0
parentdb2ef2407794065450a28df0bafb5c01a9f48302
Merge ... '4699a5e1d4242bae2ec7ffb11bfb87bd49e92de6'
     and '8b5068649e32f09f7094cee79f900f1394bc9d65'