Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:33:08 +0000 (15:33 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:33:08 +0000 (15:33 +0900)
commit1a7cd1833799319b16ab7b7f4b2ea1466c8f3a41
tree063abb9af4e7c2134d0380b7134b29224396a799
parent0381b243d165585d4d690523745c008bfd960387
parenta50c8c7de082bbe8e803cf716a72aa9689f56d4e
Merge branch 'master' into task/slp/release