[librapi/f13/master: 6/6] Merge branch 'master' into f13

[Andreas Bierfert]

commit 420c7f0fb780b93b0dad1c74479bfcc93a415171
Merge: e9b02a7 ea07ae7
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sat Feb 19 10:08:37 2011 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	librapi.spec
    	sources

 .gitignore   |    2 +-
 librapi.spec |   17 ++++++++++++-----
 sources      |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index e478e04,0da2bdc..3b9f012
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--librapi2-0.15.tar.gz
+ /librapi2-0.15.1.tar.gz