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)
     and '8b5068649e32f09f7094cee79f900f1394bc9d65'


Trivial merge