From 6a8f65bf184d85a0c51ffecca16f48e6f4b1ff12 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 03 Aug 2010 20:52:11 +0000
Subject: Merge branch 'stable'

---
(limited to 'ui-atom.c')

--
cgit v0.9.0.2