merge of '25bb53fbf963dd3caa035a35812ce4e881aaf682'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:47:22 +0000 (13:47 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 27 Sep 2006 13:47:22 +0000 (13:47 +0000)
commitc0539a99fb0c369c128a6c471248160cf5fa375a
treebce95e72a63c6c43994ac6e29c6d666703fc1794
parent69de8096736a271e00843833a55b6685148d31d9
parent696ad54999f0ff0e8f3a9ae291cf3b1f0c6e24b6
Merge ... '25bb53fbf963dd3caa035a35812ce4e881aaf682'
     and '357d97e86b9fe8fce1d432f4c1abcd5d56b0107c'