Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 02:41:33 +0000 (11:41 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 02:41:33 +0000 (11:41 +0900)
commitb901a6168bcf7c011eb473e0e3fd4766d0cccb1a
treec8181acbc8ac01db9000b2e0d5727658393b8f4b
parentaf986dc777a96ce35761c4a73966fd7d2bbf0faf
parent847948f5c8c1031a919f77e90834ffe04dd84461
Merge branch 'master' into release