Sync at revision 9354 05.02.2014

http://shareaza.sf.net
Merge branch 'master' into My-Code