merge of '5f80d82b77d53ef77154af1dcd9298bf7c5f389d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 31 Jul 2008 10:19:09 +0000 (10:19 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 31 Jul 2008 10:19:09 +0000 (10:19 +0000)
commit03912c8ebd075977a9256ff22b95419fe5ab5e5d
treedb473f52a548489e6307a3f290f9345040767bfa
parent03b58938729959e57906cd3dac6d7c022f28d59a
parent6f9d22c671deff0ec85a2ee129edc9d2ff31941c
Merge ... '5f80d82b77d53ef77154af1dcd9298bf7c5f389d'
     and 'e10700938896fb54483d9c1a8c452585cdd764be'