Merge branch 'dev'
authorFrederic PAUT <frederic.paut@linux.intel.com>
Wed, 21 Mar 2012 09:42:56 +0000 (10:42 +0100)
committerFrederic PAUT <frederic.paut@linux.intel.com>
Wed, 21 Mar 2012 09:42:56 +0000 (10:42 +0100)

Trivial merge