merge of '4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Feb 2008 22:15:50 +0000 (22:15 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 17 Feb 2008 22:15:50 +0000 (22:15 +0000)
commitbe5ee58f3d895b64c6fab84d14807629b0404851
tree17f0445b3d8a546de7ad2a7dddaf8827fc17f3da
parent1b1d31889caebc06e4a140011ee41db4b2f4c989
parentec91747176dcfbb05f2a3e87100b67ecdd076013
Merge ... '4b9bf269fccb2d8469b9d1ccfe6d73ac060a6b29'
     and 'fce7884660951ebd01cb61a963139c631312da95'