merge of '49e3b25caa2441cc80257be9db4cfae38d02f9f4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 12:49:39 +0000 (12:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 Nov 2007 12:49:39 +0000 (12:49 +0000)
commitb1a0540a31e1646ff44fe9ea12e566100866c559
tree3341a662f43108a08cd848df48d685ea4318c547
parent42bc2c60b8da331a980434334a95089f71519049
parent999b30c11ad6a81c62ef4bfca1169bce9f30fcb5
Merge ... '49e3b25caa2441cc80257be9db4cfae38d02f9f4'
     and 'ebcdb1c426afec84f66e85e956dd5463868b1484'