merge of '5b67d1cb3227253f3f4b525375b174d391b45a4a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Mar 2007 14:53:31 +0000 (14:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 21 Mar 2007 14:53:31 +0000 (14:53 +0000)
commit2972e6580a3d5b94fd752fddf6dc2bef31cef1a2
treeb1484e9836e3112c8950f7a6ace3166377ee0010
parent111e45dcbab34e3c969528924931498a4e989a87
parent2e7cbdc4beada61a4b8a190312d29b221aa9f688
Merge ... '5b67d1cb3227253f3f4b525375b174d391b45a4a'
     and '8b675ccc53dfab5cb741e302ba279dca3cd6cf5c'