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)
commit8d432ed9532f2aea9c1cb9d350d5b75dfd8edb57
tree557cf0f0993046d5d84b75d044d89faaf73b49a1
parent4ade06194c864cd3767e128d20204f39bdfc8ec8
parent5423b52a13e60c5dbedec5e5da899681c474b506
Merge branch 'master' into 2.1

Change-Id: I3cc253384d1bfd90fc072bdb7c2f514d9fc77e6b