Merge "Diff between master and tizen_2.1" into tizen_2.1
authorKunal Sinha <kunal.sinha@samsung.com>
Thu, 23 May 2013 10:56:35 +0000 (19:56 +0900)
committerGerrit Code Review <gerrit2@kim11>
Thu, 23 May 2013 10:56:35 +0000 (19:56 +0900)

Trivial merge