Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 20 Dec 2012 14:46:28 +0000 (23:46 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 20 Dec 2012 14:46:28 +0000 (23:46 +0900)
commit3c59e584331bf53789835b8b38ef2db9221c8649
treed1fa603186195f396b8469c7688d03c09cb8d424
parent061f2d71aa7d8cd597b5975485887f89cd692b92
parentab435715d02cf0469217db4183abb7680d48de36
Merge branch 'master' into task/slp/release