merge of 'c2682ec1dd418a696aa5cec3d278f7cfd4386443'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 15:11:05 +0000 (15:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 15:11:05 +0000 (15:11 +0000)
commitfeaff8459f0297a60feb0d7ef30840b408dff7f5
tree66ad9f91e568c9a58805a316efbca1fd23b3b06f
parent2794320ec9e9a4fb99a7e20c8bef15a06ed788b2
parent30136a8e89b86b9e3d0fa4b07fafdf484ff8d4f2
Merge ... 'c2682ec1dd418a696aa5cec3d278f7cfd4386443'
     and 'cf7f497fc8382ee5981d4c920096851395f4fcaa'