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)
commita109b85515d8a9921e44af82013836ca34a27ffa
tree8d43738fd52cbe614a0aa85f22710b9eb21f1016
parent5a8568fe35e159ead42c4409ec8eb9f45c5d6c3b
parent2e6657729d912dae555c0a019486ba9ddafaa0f1
Merge branch 'future'