(See? That's why I hate branching - thank the gods that subversion has the "merge" command) git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1016 ebee16cc-31ac-478f-84a7-5cbb03baadba