Merge branch 'master' into tizen_2.1
authorTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 8 Apr 2013 09:24:40 +0000 (12:24 +0300)
committerTelle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com>
Mon, 8 Apr 2013 09:24:40 +0000 (12:24 +0300)
commit68a25935c9deddaee30e7d04a5644fe8a20027cc
tree00ccaf2c450149f3d23f0fd6eb19e3c09fd4e18e
parent8d432ed9532f2aea9c1cb9d350d5b75dfd8edb57
parentf385d2664add03f81196e314c7ca4ae50451dbb1
Merge branch 'master' into tizen_2.1