Merge "Merge branch 'tizen_2.1' into tizen_2.2" into tizen_2.2
authorwoo <s-w.woo@samsung.com>
Wed, 5 Jun 2013 10:27:27 +0000 (19:27 +0900)
committerGerrit Code Review <gerrit2@kim11>
Wed, 5 Jun 2013 10:27:27 +0000 (19:27 +0900)

Trivial merge