2452 commits

Author	SHA1	Message	Date
Simon Morlat	1be210a995	Merge branch 'master' into dev_sal	2010-01-20 17:08:28 +01:00
Simon Morlat	999d216d7c	purge out p2pproxy	2010-01-20 15:44:30 +01:00