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

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.4.25
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 435f26e8d9b901aa671b094db23c0f3335284504
Merge: 5cb095bc2516161b61771c3ed6c0658e37c35551 e3b94526880e62170b9475c2794070f8e0e2cd0e
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Mar 29 16:57:38 2012 +0800

    Merge branch 'dfsg'


-- 
libzen packaging