Merge branch 'backports' master
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Fri, 11 Oct 2013 19:57:14 +0000 (16:57 -0300)
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Fri, 11 Oct 2013 19:57:14 +0000 (16:57 -0300)

Trivial merge