Merge branch 'master' into tizen_2.1
authorKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 6 May 2013 15:40:04 +0000 (00:40 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Mon, 6 May 2013 15:40:12 +0000 (00:40 +0900)
Change-Id: Ie6789dbb9e42c74b8002cb03f6a5b577440fad9b


Trivial merge