Merge branch 'master' of review:profile/ivi/neard submit/1.0_post/20121012.071401
authorOlivier Guiter <olivier.guiter@linux.intel.com>
Tue, 9 Oct 2012 12:56:50 +0000 (14:56 +0200)
committerOlivier Guiter <olivier.guiter@linux.intel.com>
Tue, 9 Oct 2012 12:56:50 +0000 (14:56 +0200)

Trivial merge