Changed pins definition in variants from constants to #defines.
Merge branch 'master' of github.com:arduino/Arduino