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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 1ed8da80c1776e61f234ecbe5a5771e439993173
Merge: d22045e8d093a4ce2e25b7b9e10f81cd8cca4971 0c202c7b9d44cda10fec9d921ce447872ab7ff63
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sun Aug 19 19:38:17 2012 +0800

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


-- 
libzen packaging