From 670f99097939a08510c2c909cd38f8083800861a Mon Sep 17 00:00:00 2001
From: Lars Hjemli <larsh@slackbox.hjemli.net>
Date: Sun, 06 Sep 2009 17:33:27 +0000
Subject: Merge branch 'stable'

---
(limited to 'git')

--
cgit v0.9.0.2