Merge branch 'master' into upstream
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Mon, 4 Nov 2013 19:26:01 +0000 (17:26 -0200)
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Mon, 4 Nov 2013 19:26:01 +0000 (17:26 -0200)

Trivial merge