Merge branch 'master' into tizen2
authorYounghwan Ahn <younghwan_.an@samsung.com>
Fri, 4 Jan 2013 02:56:38 +0000 (11:56 +0900)
committerYounghwan Ahn <younghwan_.an@samsung.com>
Fri, 4 Jan 2013 02:56:38 +0000 (11:56 +0900)

Trivial merge