[SCM] lvtk/master: Merge tag 'upstream/1.1.1_dfsg0'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.1~dfsg0
Imported Upstream version 1.0.4~dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e4e8651d0f357154c17e4c527f0fbb1989ab91f4
X-Git-Newrev: 638c0946b443cb9aef98e066c80d6db0fba0c1bc

The following commit has been merged in the master branch:
commit 638c0946b443cb9aef98e066c80d6db0fba0c1bc
Merge: e4e8651d0f357154c17e4c527f0fbb1989ab91f4 0f0386e82b271b2334b0d59fa539bb953feedcab
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 9 12:57:02 2013 +0200

    Merge tag 'upstream/1.1.1_dfsg0'
    
    Upstream version 1.1.1~dfsg0

diff --combined .gitignore
index 5f5d0e0,8f35a04..4d6a046
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,3 +1,4 @@@
 +/.pc
  *.pyc
  build/
  .cproject
@@@ -10,3 -9,4 +10,4 @@@ lock-waf
  .waf-*/
  waf-*/
  *~
+ .DS_Store

-- 
lvtk packaging