Merge branch 'master' of ssh://sun@ryoko:22003/home/sun/GIT/xmlrtorrent
authorRalf Ertzinger <sun@lain.camperquake.de>
Fri, 26 Dec 2008 20:46:02 +0000 (21:46 +0100)
committerRalf Ertzinger <sun@lain.camperquake.de>
Fri, 26 Dec 2008 20:46:02 +0000 (21:46 +0100)

Trivial merge