Merge branch 'release'
authorhudson <hudson@samsung.com>
Fri, 27 Jan 2012 11:16:49 +0000 (20:16 +0900)
committerhudson <hudson@samsung.com>
Fri, 27 Jan 2012 11:16:49 +0000 (20:16 +0900)
Change-ID: I1d6c8d44d8d23cd678f5a84ed1ee3b15634a8078


Trivial merge