From 2d2bb4da57f4daabfa8071e29344c145fb940e4d Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Fri, 7 Dec 2012 16:42:53 +0200
Subject: [PATCH] Some fixes.