Merge branch 'master' into 2.1 2.1b_release accepted/tizen_2.1/20130425.022936 submit/tizen_2.1/20130424.223701
authorJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:37:28 +0000 (16:37 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Tue, 16 Apr 2013 07:37:28 +0000 (16:37 +0900)

Trivial merge