Merge remote-tracking branch 'origin/master'
authorSimo Fält <simo.falt@nokia.com>
Wed, 28 Mar 2012 14:05:48 +0000 (17:05 +0300)
committerSimo Fält <simo.falt@nokia.com>
Wed, 28 Mar 2012 14:05:48 +0000 (17:05 +0300)

Trivial merge