From ab80f326f47e2e83aaf35ac8b05e8b2c7e0966c8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Aug 2011 11:19:26 +0200
Subject: [PATCH] 	* grub-core/commands/wildcard.c (make_regex): Handle
 @.

---
 ChangeLog                     | 4 ++++
 grub-core/commands/wildcard.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 26af06ed3..345f8f4cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (make_regex): Handle @.
+
 2011-08-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Move cryptodisk logic to appropriate place.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index d2f4347d5..256c07e51 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -139,6 +139,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
 	case '.':
 	case '(':
 	case ')':
+	case '@':
 	  buffer[i++] = '\\';
 	  buffer[i++] = ch;
 	  break;