Merge branch 'develop' into staging
authordonghee yang <donghee.yang@samsung.com>
Tue, 27 Nov 2012 17:02:16 +0000 (02:02 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Tue, 27 Nov 2012 17:02:16 +0000 (02:02 +0900)

Trivial merge