[kupfer: 5/5] Merge branch 'maint'

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 5c4678d6dd2cb5881cc14d25fa8f6982778e389a
Merge: 9dc819b c62ed8b
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Mon Feb 8 12:35:54 2010 +0100

    Merge branch 'maint'
    
    * maint:
      NEWS for pandoras-box-1.1
      Draft NEWS
      apt_tools: Use apt-get install --yes  as default install method
      chromium: if there is no chromium bookmarks file, look for a google-chrome one

 NEWS                       |   17 +++++++++++++++++
 kupfer/plugin/apt_tools.py |    2 +-
 kupfer/plugin/chromium.py  |    5 +++++
 3 files changed, 23 insertions(+), 1 deletions(-)
---