From 4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 07 Nov 2009 14:35:36 +0000
Subject: Merge branch 'stable'

---
(limited to 'Makefile')

--
cgit v0.9.0.2