From 023d933121ca7352a069f3886caf6fbe958ba27d Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 07 Apr 2010 22:50:20 +0000
Subject: Merge branch 'stable'

---
(limited to 'git')

--
cgit v0.9.0.2