b42f288 Merge remote branch 'origin/f12/master'

Merged and Committed by lfarkas 13 years ago
    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	jna-3.0.2-loadlibrary.patch
    	jna-3.2.4-loadlibrary.patch
    	jna-3.2.5-loadlibrary.patch
    	jna.spec
    	sources