merge
Merge branch 'master' of github.com:pardus-anka/2013

Conflicts:
	hardware/mobile/libimobiledevice/pspec.xml