Merge branch 'atomicio-remove' into release
authorLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 05:46:30 +0000 (00:46 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 18 Jan 2012 05:46:30 +0000 (00:46 -0500)

Trivial merge