Merge branch 'master' of git://gitorious.org/electrum/electrum

client/MANIFEST.in

@@ -5,4 +5,5 @@ exclude setup.py
 recursive-include ecdsa *.py
 recursive-include aes *.py
 include icons.qrc
+include remote.php
 recursive-include icons *

client/electrum

@@ -93,7 +93,7 @@ if __name__ == '__main__':
 
     if not wallet.file_exists and cmd not in ['help','create','restore']:
         print "Wallet file not found."
-        print "Type 'electrum.py create' to create a new wallet, or provide a path to a wallet with the -d option"
+        print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
         sys.exit(0)
     
     if cmd in ['create', 'restore']:

client/remote_wallet.py

@@ -86,7 +86,7 @@ if __name__ == '__main__':
 
     if len(sys.argv)>1:
         import jsonrpclib
-        server = jsonrpclib.Server('http://%s:%d'%(host,port))
+        server = jsonrpclib.Server('http://%s:%s@%s:%d'%(username, password, host, port))
         cmd = sys.argv[1]
 
         try: