Merge branch 'master' into tizen_2.0
authorKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 18 Dec 2012 12:27:00 +0000 (21:27 +0900)
committerKim Gibyoung <lastkgb.kim@samsung.com>
Tue, 18 Dec 2012 12:31:00 +0000 (21:31 +0900)
Change-Id: I1fadabf3908e7503757a9f3fca87dfd05b5657b4


Trivial merge