[lua-posix: 4/5] Merge branch 'master' into f12

[Tim Niemueller]

commit 9387c34fa522fb544316d21843901d22d9b80adf
Merge: a8933e2 fcca322
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Sun Aug 15 12:55:26 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 .gitignore     |    2 +-
 lua-posix.spec |    9 ++++++---
 sources        |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 5e844e6,018a8e9..4d187cd
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--luaposix-5.1.4.tar.gz
+ luaposix-5.1.7.tar.bz2