merge of '71b2a974e9dd890e2d240ddc1eaa4be6592e629e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 14:27:17 +0000 (14:27 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 3 Dec 2006 14:27:17 +0000 (14:27 +0000)
commit4c54e301d475c4faab9b4234bd029a14c793a3dc
treef58c5c9da772f88b959e1ef9967a1df1024b6596
parent84fedf8889fcc1b2523e6d8e2d137cbf6c7d1c44
parente3011a0386d0123954ff328ef0de422b5ecc676e
Merge ... '71b2a974e9dd890e2d240ddc1eaa4be6592e629e'
     and 'e7bf5c0ee8097ad652cdcb00e38545e02e057855'