[git-cola/f14/master: 5/6] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/git-cola into f14/master

[Kevin Kofler]

commit 6bbe772f84947e31322297834bbaa43fd73abc74
Merge: c18f2bf e9d0c2d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Jan 5 09:08:17 2011 +0100

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/git-cola into f14/master

---