From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 27 Jan 2009 22:03:05 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/a61871a18ffa9fc28e7ab0950415404350c8c857

Merge branch 'stable'
---

a61871a18ffa9fc28e7ab0950415404350c8c857