From 780d2d98598e621d12c7b23d4c68b5ddc7019838 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 15 Mar 2009 08:06:20 +0000
Subject: Merge branch 'stable'

---
(limited to 'Makefile')

--
cgit v0.9.0.2