From 5c34d96f7e000eb47418ac9e39dabf92b767c9f2 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 08 Dec 2009 17:30:02 +0000
Subject: Merge branch 'stable'

---
(limited to 'Makefile')

--
cgit v0.9.0.2