Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 12 Dec 2011 07:50:06 +0000 (16:50 +0900)
committerhudson <hudson@samsung.com>
Mon, 12 Dec 2011 07:50:06 +0000 (16:50 +0900)
commit14319904914184a7b789d8b91c8f83b64a6bf8b0
treee8817b8a38b0f6e8e58ab8a7cd64a84cae4c4106
parent878c1d0dbc8fd00e02cd652d2c4d0feb770203c7
parentfa1fce7774db021e27535beb0c86ac17cc39cc38
Merge branch 'master' into release