Merge branch 'tizen_2.1_smack' into tizen_2.1
[apps/core/preloaded/ug-camera-efl.git] / images /
2013-03-12 Jinkun JangTizen 2.1 base