def: 6458

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@92377 6b8eccd3-e8c5-4e7d-8186-e12b5326b719
def: 6476

git-svn-id: svn+ssh://kelev.kaltura.com/usr/local/kalsource/backend/server/tags/gemini_2012_10_22@92378 6b8eccd3-e8c5-4e7d-8186-e12b5326b719