Merge branch 'master' into tizen_2.2 tizen_2.2 2.2.1_release submit/tizen_2.2/20131107.062636
authorgs86.lee <gs86.lee@samsung.com>
Tue, 1 Oct 2013 07:17:01 +0000 (16:17 +0900)
committergs86.lee <gs86.lee@samsung.com>
Tue, 1 Oct 2013 07:17:01 +0000 (16:17 +0900)

Trivial merge