[SCM] timemachine/master: Merge commit 'upstream/0.3.3'

[adiknoth-guest at users.alioth.debian.org]

Imported Upstream version 0.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6b8abcce67d68180850eff3505391f0be6d52547
X-Git-Newrev: 78339aaf47f4157374af3becbe348e4a2c26ca28

The following commit has been merged in the master branch:
commit 8abf5a63141ceaacc1a26df91698eceed4d74c6c
Merge: ed4966135ac8a6909f279fa9eba7f55a4df66e7a ad330debd2e90f123783998d16cd814e7606a3bb
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Feb 1 14:48:55 2011 +0100

    Merge commit 'upstream/0.3.3'


-- 
timemachine packaging