merge of 'a97c08deaa64fb078313a1bd6084b0922666da7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 30 Nov 2006 12:08:12 +0000 (12:08 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 30 Nov 2006 12:08:12 +0000 (12:08 +0000)
commit1fd836ede6d52a7a4ed4d0c99c80dbb4d1919a38
treec7b04829effdf43a3d86faa8422fd14a8ce94a5f
parent6555d4f084871fc3932752516b80af9d2e9724e0
parent7acbce36f1bfe5e5dca73c3b7260f592499f7115
Merge ... 'a97c08deaa64fb078313a1bd6084b0922666da7a'
     and 'aa965681ce3df03a73c3281f983d5fabc6facc40'