Merge branch 'master' of ssh://tz.otcshare.org/profile/base/libXi submit/trunk/20130319.041559 submit/trunk/20130319.041607
authorAnas Nashif <anas.nashif@intel.com>
Tue, 19 Mar 2013 04:15:52 +0000 (21:15 -0700)
committerAnas Nashif <anas.nashif@intel.com>
Tue, 19 Mar 2013 04:15:52 +0000 (21:15 -0700)

Trivial merge