[SCM] brutefir/master: Merge commit 'upstream/1.0k'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.0k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6067ca57575f232299d862b4b85ecf3bc14cd391
X-Git-Newrev: 3d79702af3115143516e9fdf0d6ed444c4c38111

The following commit has been merged in the master branch:
commit 3d79702af3115143516e9fdf0d6ed444c4c38111
Merge: 6067ca57575f232299d862b4b85ecf3bc14cd391 1dad2c438aafacdf9d081c0ed94f20ad3b869502
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 20 13:36:49 2010 +0200

    Merge commit 'upstream/1.0k'


-- 
brutefir packaging