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

Trivial merge