merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:03 +0000 (01:11 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:03 +0000 (01:11 +0900)
commit2d8877328e1cb90ef8c6e57dbf2a55aa1a7e9fd2
tree2a169dbf728a1444810776a114433fac29113e96
parentfe3d05ba09c9a9758528b14bc6d4b49646d664be
merge with master
freedesktop.org.xml.in
packaging/shared-mime-info.spec