Merge branch 'release' into develop
authorhyunsik.noh <hyunsik.noh@samsung.com>
Wed, 1 Feb 2012 14:17:34 +0000 (23:17 +0900)
committerhyunsik.noh <hyunsik.noh@samsung.com>
Wed, 1 Feb 2012 14:17:34 +0000 (23:17 +0900)
Change-ID: Ie1a300f2f94c11ce8dd279d3cee68488734fde5f


Trivial merge