merged changes from RC_1_0 to change email address from @rasterbar.com to @libtorrent.org

git-svn-id: http://libtorrent.googlecode.com/svn/trunk@10395 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda
fix makefile build

git-svn-id: http://libtorrent.googlecode.com/svn/trunk@10396 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda