From 39ab6f252acdf80a0ccae46e7b587dac5928196c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Apr 2009 17:30:22 +0000
Subject: [PATCH] * Repairing some mergeinfo that got screwed up by the
 cherrypick in   r14605.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15321