Merge branch 'master' into tizen_2.0
authorNam KwanWoo <kw46.nam@samsung.com>
Fri, 18 Jan 2013 06:28:45 +0000 (15:28 +0900)
committerNam KwanWoo <kw46.nam@samsung.com>
Fri, 18 Jan 2013 06:28:50 +0000 (15:28 +0900)
Change-Id: I50c26d2ae1b7c848fd291d9deb769e74c9d3a955


Trivial merge