fixes issue 1319
fixes issue 1320

git-svn-id: http://adblock-chinalist.googlecode.com/svn/trunk@5242 438db56c-134b-0410-a3ef-09048d3a9d03
Merge remote-tracking branch 'remotes/trunk' into googlecode