Merge branch 'master' into tizen_2.0
authorYounghwan Ahn <younghwan_.an@samsung.com>
Tue, 15 Jan 2013 08:39:10 +0000 (17:39 +0900)
committerYounghwan Ahn <younghwan_.an@samsung.com>
Tue, 15 Jan 2013 08:39:10 +0000 (17:39 +0900)

Trivial merge