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)
     and 'cf7f497fc8382ee5981d4c920096851395f4fcaa'


Trivial merge