From ab882bf0352d8c2ff1f8707b249d8d5e0d5bc6e7 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Sat, 29 Oct 2011 11:56:42 -0400
Subject: [PATCH] Merge branch 'ignore-failed-windows-tests', remote-tracking
 branch 'origin'