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)
commitaa36bb9f803b66c9f5ac134a1b8b6fe0ef05c2b4
tree54dedfc5744c7105966c6f2a71b1d3f4f8835f82
parent257fc44faf31d83a40a5628fe8a7045b0db317bf
parentf6dffa7211354be876bf14becd8c74c6a9d46e20
Merge branch 'master' into tizen_2.1