From e38f80e6bf613dfe2ff504645ca4bedd83a04aa8 Mon Sep 17 00:00:00 2001
From: Eric Schulte <eric.schulte@gmx.com>
Date: Fri, 3 Feb 2012 10:25:30 -0700
Subject: [PATCH] concluding cherry pick