Merge commit 'upstream/5.1.4'
authorAnas Nashif <anas.nashif@intel.com>
Mon, 5 Nov 2012 19:07:07 +0000 (11:07 -0800)
committerAnas Nashif <anas.nashif@intel.com>
Mon, 5 Nov 2012 19:07:07 +0000 (11:07 -0800)

Trivial merge