Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:44:54 +0000 (13:44 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 10 Apr 2013 10:44:54 +0000 (13:44 +0300)

Trivial merge