Merge "Merging master changes to tizen_2.1 branch" into tizen_2.1
authorAyush Srivastava <ayush.sriv@tizendev.org>
Tue, 21 May 2013 14:26:33 +0000 (23:26 +0900)
committerGerrit Code Review <gerrit2@kim11>
Tue, 21 May 2013 14:26:33 +0000 (23:26 +0900)

Trivial merge