# HG changeset patch
# User pjenvey
# Date 1182984571 0
# Node ID ccf4c2e172009107eb4770d7a86dbc7bc9898c7f
# Parent  9a0b29aaebb293e0dfb757c3f4780a1020083c83
merged r182 from trunk

diff --git a/0.8.x/ChangeLog b/0.8.x/ChangeLog
--- a/0.8.x/ChangeLog
+++ b/0.8.x/ChangeLog
@@ -18,6 +18,7 @@
    are now always sorted alphabetically.
  * The Python message extractor now respects the special encoding comment to be
    able to handle files containing non-ASCII characters (ticket #23).
+ * Added 'N_' (gettext noop) to the extractor's default keywords.
 
 
 Version 0.8
diff --git a/0.8.x/babel/messages/extract.py b/0.8.x/babel/messages/extract.py
--- a/0.8.x/babel/messages/extract.py
+++ b/0.8.x/babel/messages/extract.py
@@ -44,6 +44,7 @@
     'ungettext': (1, 2),
     'dgettext': (2,),
     'dngettext': (2, 3),
+    'N_': None
 }
 
 DEFAULT_MAPPING = [('**.py', 'python')]