Send and receive
Merge branch 'master' of git://bibleconsultants.dyndns.org/shona