merge of '1a4cfa896e213a1c6c15d152c0b570b340bdb272'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Nov 2006 18:50:01 +0000 (18:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 28 Nov 2006 18:50:01 +0000 (18:50 +0000)
commit3870785176302610bec71b784e26a8b23602f6ea
treefd30c36868a3f1e71d9a563ab4fd4e1549a9d222
parent929df1f986330f51fd29a4b08b1c03d6fccfce76
parent6ee18ab0f2901d2d87a94e761f29d088c6e5a204
Merge ... '1a4cfa896e213a1c6c15d152c0b570b340bdb272'
     and 'fb8e5228aa3b97342963e6d2b8465122d5c7b801'