Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 15 May 2013 07:27:50 +0000 (10:27 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 15 May 2013 07:27:50 +0000 (10:27 +0300)

Trivial merge