Merge branch 'master' into tizen2
authorYounghwan Ahn <younghwan_.an@samsung.com>
Fri, 4 Jan 2013 05:03:37 +0000 (14:03 +0900)
committerYounghwan Ahn <younghwan_.an@samsung.com>
Fri, 4 Jan 2013 05:03:37 +0000 (14:03 +0900)

Trivial merge