From 6940b23b9e4698ba466a4616e4de77b986560ad3 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 29 Aug 2010 15:40:51 +0000
Subject: Merge branch 'stable'

---
(limited to 'git')

--
cgit v0.9.0.2