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)
Change-Id: Ib75e9796cdc1695959404ca854657a900c79718a


Trivial merge