[gigolo/f14/master: 2/2] Merge branch 'master' into f14

[Christoph Wickert]

commit 16cf8a59ec6492b18d050509e366df92fe84076e
Merge: 40924ba 632f0be
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Sep 3 22:34:25 2010 +0200

    Merge branch 'master' into f14

 gigolo-0.4.1-update-de.po.patch |  305 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 305 insertions(+), 0 deletions(-)
---