when calculating desired queue size, block size should not depend on whether or not they are merged in the requests
when calculating desired queue size, block size should not depend on whether or not they are merged in the requests

git-svn-id: c39a6fcb73c71bf990fd9353909696546eb40440@2926 a83610d8-ad2a-0410-a6ab-fc0612d85776

mirror/libtorrent,john-peterson/libtorrent-old,mirror/libtorrent,john-peterson/libtorrent-old,john-peterson/libtorrent-old,mirror/libtorrent,john-peterson/libtorrent-old,mirror/libtorrent,mirror/libtorrent,john-peterson/libtorrent-old,mirror/libtorrent,john-peterson/libtorrent-old