From 02d5abd5b8661b170cfb825b23d6846f95aba79b Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Sat, 9 Jul 2011 17:27:13 +0200
Subject: [PATCH] Merge branches 'done_view' and 'master'