merge of 'db3553a557f70630b0299ead528cf8868b9d65fe'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 07:53:07 +0000 (07:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 4 Sep 2007 07:53:07 +0000 (07:53 +0000)
commitabf18fdd06972bcf2bdc9469499fb0dd6c1d2650
treef44de20a6ff6aee166d14e2158737a0d30d489e7
parentabfe3c08e5462a5cc1c4c6713273699c55f1b4ca
parentc5afcacf80b32c685b1fe7bdab0347fdea78e4ea
Merge ... 'db3553a557f70630b0299ead528cf8868b9d65fe'
     and 'febd6fbea9748c083f400f53d4ed18480207fd5a'
packages/scummvm/scummvm.inc