From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 25 Jul 2009 10:29:22 +0000 (+0200)
Subject: Merge branch 'lh/embedded'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/286a905842dc0bec6d21a614ec4a97c5f19d5bc4?hp=286a905842dc0bec6d21a614ec4a97c5f19d5bc4

Merge branch 'lh/embedded'

Conflicts:
	cgitrc.5.txt
	ui-shared.c
---