Merge branch 'master' of ssh://112.106.1.251:29418/framework/uifw/isf
authorLi Zhang <li2012.zhang@samsung.com>
Sun, 30 Dec 2012 11:30:14 +0000 (19:30 +0800)
committerLi Zhang <li2012.zhang@samsung.com>
Sun, 30 Dec 2012 11:30:14 +0000 (19:30 +0800)

Trivial merge