From eb1b9c3664c80884f73d2fd10b7df372261801b9 Mon Sep 17 00:00:00 2001
From: Seth House <seth@eseth.com>
Date: Tue, 27 Aug 2013 14:30:39 -0600
Subject: [PATCH] Revert "removed merge"

This reverts commit 125917b7d6600009185d382ca3c9e238068a5878.
---
 mysql/package-map.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja
index 8f78661..880ff67 100644
--- a/mysql/package-map.jinja
+++ b/mysql/package-map.jinja
@@ -20,4 +20,4 @@
         'config': '/etc/mysql/my.cnf',
         'python': 'dev-python/mysql-python',
     },
-}) %}
+}, merge=salt['pillar.get']('mysql:lookup')) %}