merge of '8c0da7de9130cf6ce338544b5a8d83595a1fd839'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 15:26:55 +0000 (15:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 15:26:55 +0000 (15:26 +0000)
commit1966abef451877040a2114f8e2e0c1fbd0bdf410
treea79e3d4e2da8f770a7eb9b54c5a90b30c0be9990
parentf01d630a3e356f2815fe537f6fd9b94232d1a66e
parentf6c111ef94b3b2e609b43fe0958cba4808d38c16
Merge ... '8c0da7de9130cf6ce338544b5a8d83595a1fd839'
     and 'fa6299477f4dc9026d80a08ac4d4494c8c32eb64'