Merge branch 'master' into tizen_2.0
authorNam KwanWoo <kw46.nam@samsung.com>
Fri, 21 Dec 2012 02:04:22 +0000 (11:04 +0900)
committerNam KwanWoo <kw46.nam@samsung.com>
Fri, 21 Dec 2012 02:04:27 +0000 (11:04 +0900)
commit4658a8f167a19d42dad674b7c23856d1962a2690
tree723d281322cd238a1a8ec9e7c9744dd778c17896
parent984a4920ca34018a1d374b398cee21733e7d72ea
parentd03e23dd12fa3a45d0d3972f1e1959177eac9205
Merge branch 'master' into tizen_2.0

Change-Id: Ib75e9796cdc1695959404ca854657a900c79718a