Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 20 Mar 2013 10:52:55 +0000 (12:52 +0200)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Wed, 20 Mar 2013 10:52:55 +0000 (12:52 +0200)
Conflicts:
.gitignore

Change-Id: If3f5be7e4ca372bf4f4ea48aa44d3c53dd2b3b0e


Trivial merge