From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 15 Jan 2011 06:24:41 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 16-1~16
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1eab28ed210e350433b0d695c16895e3d17ca2e;p=systemd

Merge branch 'master' into debian

Conflicts:
	configure.ac
	src/gnome-ask-password-agent.vala
---

f1eab28ed210e350433b0d695c16895e3d17ca2e