straight outta CVS
Merge branch 'master' of jonny290.github.com:jonny290/synchronet
first time round