Merge branch 'master' into dft

Author: mih

COPYING

@@ -19,8 +19,10 @@ documentation is covered by the MIT license.
 
   The MIT License
 
+  Copyright (c) 2009-2011 Matthew Brett <[email protected]>
+  Copyright (c) 2010-2011 Stephan Gerhard <[email protected]>
   Copyright (c) 2006-2010 Michael Hanke <[email protected]>
-  Copyright (c) 2009-2010 Matthew Brett <matthew.brett@gmail.com>
+  Copyright (c) 2010-2011 Jarrod Millman <jarrod.millman@gmail.com>
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal