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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit a14daabbf59bba74e1e37b7b7bf53b3830805f8a
Merge: e3b94526880e62170b9475c2794070f8e0e2cd0e 192a9e3c7d98caf6d94bed963a475998360d7d10
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Apr 22 18:08:47 2012 +0800

    Merge branch 'upstream' into dfsg


-- 
libzen packaging