Merge branch 'subsurfaces'
authorRafael Antognolli <rafael.antognolli@intel.com>
Thu, 10 Oct 2013 18:21:06 +0000 (15:21 -0300)
committerRafael Antognolli <rafael.antognolli@intel.com>
Thu, 10 Oct 2013 18:21:06 +0000 (15:21 -0300)

Trivial merge