From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 27 Sep 2010 06:03:30 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/d41b2ddcb331caa74c1a90a0253f234142848552

Merge branch 'stable'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---

d41b2ddcb331caa74c1a90a0253f234142848552