Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 27 Dec 2011 07:03:40 +0000 (16:03 +0900)
committerhudson <hudson@samsung.com>
Tue, 27 Dec 2011 07:03:40 +0000 (16:03 +0900)

Trivial merge