From 69f705cf5727cc1f099f6cd6af759f66bfd9a343 Mon Sep 17 00:00:00 2001
From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 07 Nov 2010 15:25:23 +0000
Subject: Merge branch 'stable'

Conflicts:
	scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
--
cgit v0.9.0.2