Merge branch 'wm' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 12 Apr 2013 04:28:36 +0000 (13:28 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 12 Apr 2013 04:28:36 +0000 (13:28 +0900)

Trivial merge