Merge branch 'tizen_2.1_smack' into tizen_2.1 submit/tizen_2.1/20130514.053736
authorlei zhang <lei527.zhang@samsung.com>
Fri, 10 May 2013 11:47:52 +0000 (20:47 +0900)
committerlei zhang <lei527.zhang@samsung.com>
Fri, 10 May 2013 11:47:52 +0000 (20:47 +0900)

Trivial merge