Merge branch 'master' of ssh://tz.otcshare.org/profile/base/rpm
authorAnas Nashif <anas.nashif@intel.com>
Thu, 7 Feb 2013 03:02:35 +0000 (19:02 -0800)
committerAnas Nashif <anas.nashif@intel.com>
Thu, 7 Feb 2013 03:02:35 +0000 (19:02 -0800)

Trivial merge