From 9043b46f85eb43c918a172663af34c084587bd1a Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 19 Sep 2010 18:58:15 +0000
Subject: Merge branch 'stable'

---
(limited to '.gitignore')

--
cgit v0.9.0.2