Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 18 Dec 2011 13:34:43 +0000 (22:34 +0900)
committerhudson <hudson@samsung.com>
Sun, 18 Dec 2011 13:34:43 +0000 (22:34 +0900)

Trivial merge