Merge branch 'master' of ssh://otcgit.jf.intel.com/~/cloudybus
authorLuc Yriarte <luc.yriarte@linux.intel.com>
Tue, 21 Aug 2012 12:41:46 +0000 (14:41 +0200)
committerLuc Yriarte <luc.yriarte@linux.intel.com>
Tue, 21 Aug 2012 12:41:46 +0000 (14:41 +0200)

Trivial merge