Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 18 Dec 2012 10:21:37 +0000 (19:21 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 18 Dec 2012 10:21:37 +0000 (19:21 +0900)
commitdb21c2c98156c0b5a81dbedcc747571033d9ddf2
treed6f9d5a1f6ac148b481e08c17cf6c6699b23ff00
parent2c603bcd4a1b5b41fa6eef90e7c9e3dcacb7abc6
parentfa2a189f1dcd55c2cb40652863f7bd6ce1c600e9
Merge branch 'master' into task/slp/release