merge of 171f7917626b9f4ae8dbf894b68c59b96f170e80
authorMika Laitio <lamikr@cc.jyu.fi>
Tue, 6 Jun 2006 23:28:48 +0000 (23:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 23:28:48 +0000 (23:28 +0000)
commite9f308acea1c1258a69d8368735390f3f234e82d
tree692196f600fd35ab69bc7a41a2020c2090dd2d8e
parentbb51887c6fd1ed22c19c32e4b755345649e7623d
parent0d4bb86c55d1506fc362f20e4fb1b4fe1d02d1ae
merge of 171f7917626b9f4ae8dbf894b68c59b96f170e80
     and 858f7c62c0df0be80b72c0b207ec39feb0025305