merge of 'b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Aug 2006 15:18:32 +0000 (15:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 18 Aug 2006 15:18:32 +0000 (15:18 +0000)
commit4f80e66dba22c67549dac232d191c335bd023b35
tree78b2b7c1bfcb16ca9fada4affb86d4c0deeccc66
parent185bcbec1d4e3eb2e22d58d50ff91bf29311ae84
parent68de23db6ef418421a2e6ad81ef3c14fca1c4c31
Merge ... 'b60b9cbd9811d42fdfd03aae3fb9d35d428d7ddc'
     and 'f9c6177ac97fd742ce5f6eb06a988296fa777bda'