merge of '17c778274717898b377338f8552576cb4fd350eb'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Feb 2008 11:18:34 +0000 (11:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 28 Feb 2008 11:18:34 +0000 (11:18 +0000)
commitf5b0cc9973d24a6e6bb9981a5ba16cf57095d1d3
tree76334941e8a143411bf13951187cf2c8c0688c7d
parent0108e4109915cb8bb54212fc1a2985b81af4f7d5
parenta6aca0c99ea61a1cee31657bef1017d824e24c82
Merge ... '17c778274717898b377338f8552576cb4fd350eb'
     and '662ae9dafb4c25857c0afa36b3303e10fdd8cea6'