Merge branch 'future'
authorLuc Yriarte <luc.yriarte@intel.com>
Wed, 29 May 2013 16:48:27 +0000 (18:48 +0200)
committerLuc Yriarte <luc.yriarte@intel.com>
Wed, 29 May 2013 16:48:27 +0000 (18:48 +0200)

Trivial merge