* merged r20081, r20084 from linux-2.6.19.2 branch git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20548 10447126-35f2-4685-b0cf-6dd780d3921f
git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20072 10447126-35f2-4685-b0cf-6dd780d3921f