From bf8293d3196d49d6c4a48b254a04415183ca2762 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 01 Sep 2010 12:32:57 +0000
Subject: Merge branch 'stable'

---
(limited to 'Makefile')

--
cgit v0.9.0.2