savannah file
savannah pulled changes in order to see how smart git merging is! qerge brans@ch 'master' of github.com:bscharm/basic-git