[libsynce/f13/master: 5/5] Merge branch 'master' into f13

[Andreas Bierfert]

commit bf2270b50c2f5416bea4033c40c7b5a211044500
Merge: 9b34cbf eda7105
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sat Feb 19 09:11:16 2011 +0200

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

 .gitignore    |    2 +-
 libsynce.spec |   13 ++++++++-----
 sources       |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 54c429e,0410af8..0fbce55
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--libsynce-0.15.tar.gz
+ /libsynce-0.15.1.tar.gz