merge of '2dedd269e3ce065dd32e2397e0e647b83f2a26ee'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 17:18:32 +0000 (17:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 4 Apr 2007 17:18:32 +0000 (17:18 +0000)
commit448810d9f975b603c78344d00bb3faa4cc7f02a7
treea8325dd0f17a5a086df57b08a369ad29f1baea60
parent592037954fa805b29254404bca6466bd8087fafb
parentc72b4cf97ca4e3b5cad4b9e51dee4d571b7e5e0a
Merge ... '2dedd269e3ce065dd32e2397e0e647b83f2a26ee'
     and '3b9a62d13a4d7a58079179c6df892a56648121f5'