From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 27 Feb 2010 11:53:27 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/71d3ca75d1e941948dd3b965f5a5c2f2865e94fd

Merge branch 'stable'
---

71d3ca75d1e941948dd3b965f5a5c2f2865e94fd