[jna: 7/7] Merge remote branch 'origin/f12/master'

[Levente Farkas]

commit b42f288bdb3b30bf77f3159c0771174219663b89
Merge: 060edc6 18102d4
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:36:06 2010 +0200

    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

 jna-3.2.5-loadlibrary.patch |  142 -------------------------------------------
 1 files changed, 0 insertions(+), 142 deletions(-)
---