Merge branch 'master' into tizen_2.1
authorSan Cho <san.cho@samsung.com>
Tue, 2 Apr 2013 12:54:32 +0000 (21:54 +0900)
committerSan Cho <san.cho@samsung.com>
Tue, 2 Apr 2013 12:54:32 +0000 (21:54 +0900)
Change-Id: I1bda2f111f59589bdcb944fefd8d319e56861bb5


Trivial merge