Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 27 Nov 2012 14:38:18 +0000 (23:38 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 27 Nov 2012 14:38:18 +0000 (23:38 +0900)

Trivial merge