Merge "Fix for arduinomega.properties. It was pointing at an invalid location for...
authorErich Keane <erich.keane@intel.com>
Mon, 8 Sep 2014 18:03:27 +0000 (11:03 -0700)
committerGerrit Code Review <gerrit@oicreview.vlan14.01.org>
Mon, 8 Sep 2014 18:03:27 +0000 (11:03 -0700)

Trivial merge