Merge branch 'iotlab_driver' into geni-v3
fsaintma [Mon, 13 Apr 2015 14:05:57 +0000 (16:05 +0200)]

Trivial merge