Merge branch 'master' into 2.1
authorIlkka Aulomaa <ilkkax.aulomaa@intel.com>
Mon, 25 Mar 2013 15:01:25 +0000 (17:01 +0200)
committerIlkka Aulomaa <ilkkax.aulomaa@intel.com>
Mon, 25 Mar 2013 15:13:54 +0000 (17:13 +0200)
Change-Id: I3cc253384d1bfd90fc072bdb7c2f514d9fc77e6b


Trivial merge