Merge branch 'master' into readline-bconsole-restore

Conflicts:
	bacula/technotes

diff --cc bacula/src/console/console.c
Simple merge

diff --cc bacula/src/dird/ua_dotcmds.c
Simple merge

diff --cc bacula/technotes
index cef68832a75a9fb713a6ffcb492b18f68c7cf783,85814a0aaa8b9443d47fcdfd38e8738807d7faff..4702e751ea9fa0540278cdbf8d102f8c88f07374
--- 1/bacula/technotes
--- 2/bacula/technotes
+++ b/bacula/technotes
@@@ -2,8 -2,9 +2,13 @@@
            
  General:
  
++16Nov09
++ebl  Add basic completion for restore mode 
+ 14Nov09
+ kes  Fix bug #1367 buy creating an empty query.sql file. The old query.sql
+      file is now in exmaples/sample-query.sql, but is unsupported.
 +13Nov09
 +ebl  Add .jobs type=B/C/R command to filter jobs listing
  11Nov09
  ebl  Fix basejob code for Mysql
  ebl  Fix segfault in basejob code