Merge branch 'master' into tizen_2.0
authorNam KwanWoo <kw46.nam@samsung.com>
Fri, 18 Jan 2013 07:15:59 +0000 (16:15 +0900)
committerNam KwanWoo <kw46.nam@samsung.com>
Fri, 18 Jan 2013 07:16:03 +0000 (16:16 +0900)
Change-Id: I1a09e32af0be98902be622ccc571ca45c33ec47c


Trivial merge