merge of '2c836c72090e9a06860096627e902f49c103f562'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Nov 2007 15:33:14 +0000 (15:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 13 Nov 2007 15:33:14 +0000 (15:33 +0000)
commit7a429c6177dd3807b755be4fd22912f29f129d2e
tree29ff0c0d9041e7ac014482a3aac0ff38969a5ec0
parent9f0bd5cd2d93a2ed76637ca5bbf207e763fc7edf
parent668c11a68a4ed7376f8c8192f74715e120793241
Merge ... '2c836c72090e9a06860096627e902f49c103f562'
     and 'cb1f215843394ab106315dede4a9d2d2adb8f45a'