Merge commit 'upstream/1.2.14'
authorAnas Nashif <anas.nashif@intel.com>
Thu, 22 Nov 2012 18:31:07 +0000 (10:31 -0800)
committerAnas Nashif <anas.nashif@intel.com>
Thu, 22 Nov 2012 18:31:07 +0000 (10:31 -0800)

Trivial merge