[SCM] libzen/master: Merge branch 'upstream' into dfsg

[hyperair at users.alioth.debian.org]

Imported Upstream version 0.4.27
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9ae1c2b7403fa204306b34e3a4ae71692c74c966
X-Git-Newrev: b37487f1b5956242631ecbec63569eb22580ec7f

The following commit has been merged in the master branch:
commit d22045e8d093a4ce2e25b7b9e10f81cd8cca4971
Merge: a14daabbf59bba74e1e37b7b7bf53b3830805f8a 735e67fe35545a1b53a45a0ab5e75532992e28fb
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Jun 3 13:27:29 2012 +0800

    Merge branch 'upstream' into dfsg
    
    Conflicts:
    	debian/changelog
    	debian/control


-- 
libzen packaging