From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 13 Jun 2011 13:28:18 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/be6991c1e42d548848bf2f51fd9910d14b5bdf40

Merge branch 'stable'
---

be6991c1e42d548848bf2f51fd9910d14b5bdf40