Merge remote-tracking branch 'gerrithost/master' into 2.0
authorJisung Ahn <jcastle.ahn@samsung.com>
Thu, 13 Dec 2012 07:16:26 +0000 (16:16 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Thu, 13 Dec 2012 07:16:26 +0000 (16:16 +0900)

Trivial merge