Merge commit 'upstream/1.14.2'
authorAnas Nashif <anas.nashif@intel.com>
Wed, 31 Oct 2012 02:02:41 +0000 (19:02 -0700)
committerAnas Nashif <anas.nashif@intel.com>
Wed, 31 Oct 2012 02:02:41 +0000 (19:02 -0700)

Trivial merge