Merge remote branch 'origin/camera'
authorjinhyung.jo <jinhyung.jo@samsung.com>
Tue, 8 Nov 2011 09:09:32 +0000 (18:09 +0900)
committerjinhyung.jo <jinhyung.jo@samsung.com>
Tue, 8 Nov 2011 09:09:32 +0000 (18:09 +0900)

Trivial merge