merged fixes
merged fixes

git-svn-id: 63d0ba2dd6354cbabf1109d4775da37de92b53ef@6628 a83610d8-ad2a-0410-a6ab-fc0612d85776

NoGare/libtorrent-rasterbar,NoGare/libtorrent-rasterbar,NoGare/libtorrent-rasterbar,NoGare/libtorrent-rasterbar,NoGare/libtorrent-rasterbar,NoGare/libtorrent-rasterbar