From 31665579c2779669c0cc56b8eb63f162b7e165df Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 11 Jan 2009 21:00:25 +0000
Subject: Merge branch 'stable'

---
(limited to 'Makefile')

--
cgit v0.9.0.2