Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 4 Dec 2011 11:54:46 +0000 (20:54 +0900)
committerhudson <hudson@samsung.com>
Sun, 4 Dec 2011 11:54:46 +0000 (20:54 +0900)

Trivial merge