Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 11:12:52 +0000 (20:12 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 11:13:07 +0000 (20:13 +0900)
commitcedb3344f43d8f42a722b776e33c4cd8de648375
tree1e604f1ae92e1d9b7110ff0e4ccc2eefa9ca64a7
parentd1774b5c9d67eba78b988ab93d71d8ff99ef71a3
parent0ce02c81d69e8684db91eed06e8b8ac935ca5dcd
Merge branch 'master' into sdk

Change-Id: Ic06b61351de9a6d00df34531bcd51ad5006ecd0c