Merge branch 'master' into t21
authorYoumin Ha <youmin.ha@samsung.com>
Fri, 29 Mar 2013 07:34:36 +0000 (16:34 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Fri, 29 Mar 2013 07:34:36 +0000 (16:34 +0900)

Trivial merge