diff -r 720455407d1c lib/galaxy/config.py
--- a/lib/galaxy/config.py	Thu Jun 23 11:03:45 2011 -0400
+++ b/lib/galaxy/config.py	Mon Aug 15 14:48:32 2011 +0200
@@ -74,16 +74,17 @@ class Configuration( object ):
         self.output_size_limit = int( kwargs.get( 'output_size_limit', 0 ) )
         self.job_walltime = kwargs.get( 'job_walltime', None )
         self.admin_users = kwargs.get( "admin_users", "" )
         self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-user-join@bx.psu.edu")
         self.error_email_to = kwargs.get( 'error_email_to', None )
         self.smtp_server = kwargs.get( 'smtp_server', None )
         self.smtp_username = kwargs.get( 'smtp_username', None )
         self.smtp_password = kwargs.get( 'smtp_password', None )
+        self.smtp_from = kwargs.get( 'smtp_from', None )
         self.start_job_runners = kwargs.get( 'start_job_runners', None )
         # External Service types used in sample tracking
         self.external_service_type_config_file = resolve_path( kwargs.get( 'external_service_type_config_file', 'external_service_types_conf.xml' ), self.root )
         self.external_service_type_path = resolve_path( kwargs.get( 'external_service_type_path', 'external_service_types' ), self.root )
         # Tasked job runner.
         self.use_tasked_jobs = string_as_bool( kwargs.get( 'use_tasked_jobs', False ) )
         # The transfer manager and deferred job queue
         self.enable_beta_job_managers = string_as_bool( kwargs.get( 'enable_beta_job_managers', 'False' ) )