Merge branch 'release'
authorhudson <hudson@samsung.com>
Wed, 15 Feb 2012 03:20:57 +0000 (12:20 +0900)
committerhudson <hudson@samsung.com>
Wed, 15 Feb 2012 03:20:58 +0000 (12:20 +0900)
Change-ID: Ia44bb1cf5bd920f143e19c9c9d7c7d02f90141fe


Trivial merge