Merge branch 'master' into tizen_2.1
authorJeon Hee Chul <heechul.jeon@samsung.com>
Tue, 19 Mar 2013 11:28:21 +0000 (20:28 +0900)
committerJeon Hee Chul <heechul.jeon@samsung.com>
Tue, 19 Mar 2013 11:28:51 +0000 (20:28 +0900)
commit65a3b54efc6baf5b727ddf415e7429fb6f235441
treef358fe630872157f63bbed09e9230b2e63f76f6b
parenta8ea93d483772165132e59b8c0bfb169335f152d
parent545f99276711288c65400598e6c89fada3a3c10f
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/libmm-player.spec
src/include/mm_player_priv.h
src/mm_player_priv.c

Change-Id: I64bdf91d8cbb3996d8d39197dad7c56ab9b68991
src/mm_player_priv.c