[jna: 9/9] Merge remote branch 'origin/f13/master'

[Levente Farkas]

commit 060edc65452d254d2059cf34e9a5f885edca9d2a
Merge: 360d860 3e1ad9f
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Sat Aug 7 18:28:10 2010 +0200

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	jna.spec

---