From e78186dcb63ec67a38dddfcd8f91d2108583320b Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 12 Jan 2009 07:57:23 +0000
Subject: Merge branch 'stable'

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

--
cgit v0.9.0.2