Merge "Merge remote branch 'origin/camera'"
authordk77.yun <dk77.yun@samsung.com>
Wed, 9 Nov 2011 02:37:12 +0000 (11:37 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Wed, 9 Nov 2011 02:37:12 +0000 (11:37 +0900)

Trivial merge