Merge branch 'master' into tizen_2.1
authorSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 09:21:06 +0000 (18:21 +0900)
committerSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 09:21:09 +0000 (18:21 +0900)
Change-Id: I36dfca2042e64fa771546f61d9641ab6e784510b


Trivial merge