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)
commit026514f3613091344e20d0bd53bcf81c8e634060
tree572e278d099cc9c017317b0643bb826ca0f5da46
parentbe1e479c31cb4f94911d5b61693dd65f73a0cb43
parentc3003e0b016334cb4251564499037459811928d7
Merge branch 'backports'