From 8a24019a28e046189e15fdbade21d1a716edbb56 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sat, 19 Jul 2008 14:47:54 +0000
Subject: Merge commit 'bee/master'

---
(limited to '.gitignore')

--
cgit v0.9.0.2