From 2942f34b9864af41ca0c4fe854ee17bf03037aa4 Mon Sep 17 00:00:00 2001
From: Jim Dovey <jimdovey@mac.com>
Date: Sat, 6 Jun 2009 17:16:25 -0400
Subject: [PATCH] Merge commit 'HEAD'; branch 'snofla/master'

* commit 'HEAD':

* snofla/master:
  Signed-off-by: Alfons Hoogervorst <Alfons@Itinerarios.local>