From 547a64fbd65de293c290f4e18bbeae958d54aaa7 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 12 Dec 2009 11:09:47 +0000
Subject: Merge branch 'stable'

---
(limited to 'git')

--
cgit v0.9.0.2