Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 11:54:50 +0000 (20:54 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 11:54:50 +0000 (20:54 +0900)
commitc1abf027b64399fa13ba455ca1ea9cd8db665ae4
treea797702fda24114ccd35b9e7a33771b70cb23090
parentc8141f9411eb5f594b77258d3e0274559f103d3c
parent165405605944b43b7017510871babd33992d08fc
Merge branch 'master' into release