From c2766deb67acb1eae2b36dc0f5811a9cabb6db20 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Jun 2010 09:42:12 +0000
Subject: Merge branch 'ag/atom-fixes'

---
(limited to 'Makefile')

--
cgit v0.9.0.2