[SCM] lv2fil/master: Merge commit 'upstream/2.0+20100312.git18130f5a'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0+20100312.git18130f5a
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3a8385c245680433f6a94d7f2e60f6d81bbdc26f
X-Git-Newrev: 5a49fddedc790e5a9ede0a1b964b583d89a7105a

The following commit has been merged in the master branch:
commit eb8f2a9d7a872b2b4b0d80bd2314dd5009b83116
Merge: 3a8385c245680433f6a94d7f2e60f6d81bbdc26f 6d398e3dc6f0cac9eb4a58f74368cfb3931ededf
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 30 10:55:36 2011 +0200

    Merge commit 'upstream/2.0+20100312.git18130f5a'
    
    Conflicts:
    	.gitignore

diff --combined .gitignore
index 845ca06,6ff6720..d697de0
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,7 @@@
- .pc
+ *.o
+ *.so
+ /.waf-*
+ /build
+ /.lock-wscript
+ /*.pyc
++/.pc

-- 
lv2fil packaging