diff --git a/Makefile b/Makefile
index bcc81d39..7e7c9920 100644
--- a/Makefile
+++ b/Makefile
@@ -127,5 +127,5 @@ push:
 tag:
 	git tag -l '$(S)'
 	hg tag -l '$(S)'
-	make commit
+	make commit S='$(S)'
 	make push
diff --git a/VERSION b/VERSION
index 85677852..c330710c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.2 (2012-08-29 22:00:56) stable
+Version 2.0.2 (2012-08-30 08:05:05) stable
diff --git a/applications/welcome/languages/default.py b/applications/welcome/languages/default.py
index 7fddedd2..4586b206 100644
--- a/applications/welcome/languages/default.py
+++ b/applications/welcome/languages/default.py
@@ -6,11 +6,99 @@
 '%s %%(shop[0])': '%s %%(shop[0])',
 '%s %%{shop[0]}': '%s %%{shop[0]}',
 '%s %%{shop}': '%s %%{shop}',
+'%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
 '@markmin\x01**Hello World**': '**Hello World**',
+'About': 'About',
+'Access Control': 'Access Control',
+'Administrative Interface': 'Administrative Interface',
+'Ajax Recipes': 'Ajax Recipes',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'Buy this book': 'Buy this book',
+'Cannot be empty': 'Cannot be empty',
+'Client IP': 'Client IP',
+'Community': 'Community',
+'Components and Plugins': 'Components and Plugins',
+'Controller': 'Controller',
+'Copyright': 'Copyright',
+'Created By': 'Created By',
+'Created On': 'Created On',
+'customize me!': 'customize me!',
+'Database': 'Database',
+'DB Model': 'DB Model',
+'Demo': 'Demo',
+'Deployment Recipes': 'Deployment Recipes',
+'Description': 'Description',
+'Documentation': 'Documentation',
+"Don't know what to do?": "Don't know what to do?",
+'Download': 'Download',
+'E-mail': 'E-mail',
+'Email and SMS': 'Email and SMS',
 'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
 'enter date and time as %(format)s': 'enter date and time as %(format)s',
+'Errors': 'Errors',
+'FAQ': 'FAQ',
+'First name': 'First name',
+'Forms and Validators': 'Forms and Validators',
+'Free Applications': 'Free Applications',
+'Group ID': 'Group ID',
+'Groups': 'Groups',
 'Hello World': 'Hello World',
 'Hello World  ## comment': 'Hello World  ',
 'Hello World## comment': 'Hello World',
+'Home': 'Home',
+'How did you get here?': 'How did you get here?',
+'Introduction': 'Introduction',
+'Invalid email': 'Invalid email',
+'Is Active': 'Is Active',
+'Last name': 'Last name',
+'Layout': 'Layout',
+'Layout Plugins': 'Layout Plugins',
+'Layouts': 'Layouts',
+'Live Chat': 'Live Chat',
+'Login': 'Login',
+'Lost password?': 'Lost password?',
+'Menu Model': 'Menu Model',
+'Modified By': 'Modified By',
+'Modified On': 'Modified On',
+'My Sites': 'My Sites',
+'Name': 'Name',
+'Object or table name': 'Object or table name',
+'Online examples': 'Online examples',
+'Origin': 'Origin',
+'Other Plugins': 'Other Plugins',
+'Other Recipes': 'Other Recipes',
+'Overview': 'Overview',
+'Password': 'Password',
+'Plugins': 'Plugins',
+'Powered by': 'Powered by',
+'Preface': 'Preface',
+'Python': 'Python',
+'Quick Examples': 'Quick Examples',
+'Recipes': 'Recipes',
+'Record ID': 'Record ID',
+'Register': 'Register',
+'Registration identifier': 'Registration identifier',
+'Registration key': 'Registration key',
+'Reset Password key': 'Reset Password key',
+'Role': 'Role',
+'Semantic': 'Semantic',
+'Services': 'Services',
+'Stylesheet': 'Stylesheet',
+'Support': 'Support',
+'The Core': 'The Core',
+'The output of the file is a dictionary that was rendered by the view %s': 'The output of the file is a dictionary that was rendered by the view %s',
+'The Views': 'The Views',
+'This App': 'This App',
+'Timestamp': 'Timestamp',
+'Twitter': 'Twitter',
+'User ID': 'User ID',
+'Videos': 'Videos',
+'View': 'View',
+'Welcome': 'Welcome',
+'Welcome to web2py!': 'Welcome to web2py!',
+'Which called the function %s located in the file %s': 'Which called the function %s located in the file %s',
+'You are successfully running web2py': 'You are successfully running web2py',
+'You can modify this application and adapt it to your needs': 'You can modify this application and adapt it to your needs',
+'You visited the url %s': 'You visited the url %s',
 }
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 9e585d39..07e4a28f 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -262,7 +262,8 @@ class MetaScheduler(threading.Thread):
 
             start = time.time()
 
-            while p.is_alive() and (time.time()-start < task.timeout):
+            while p.is_alive() and (
+                not task.timeout or time.time()-start < task.timeout):
                 if tout:
                     try:
                         logging.debug(' partial output saved')