[dots: 3/3] Merge commit 'egli/master'

[Eitan Isaacson <eitani src gnome org>]

commit 1f15666c1646e847f834950f8590d5681a7401b1
Merge: 4a92670... 8f3eb13...
Author: Eitan Isaacson <eitan ascender com>
Date:   Tue Aug 25 13:14:50 2009 -0700

    Merge commit 'egli/master'
    
    Conflicts:
    	dots/dots_project.py

 .gitignore           |   19 +++++++++++++++++++
 dots/dots_project.py |   13 ++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
---
diff --cc dots/dots_project.py
index 8766d63,59ec31c..a8a47dc
--- a/dots/dots_project.py
+++ b/dots/dots_project.py
@@@ -16,7 -16,8 +16,8 @@@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  import os, tempfile, host_settings, sys, gtk
  import ascii_braille
 -import gtksourceview, pango
 +import gtksourceview2, pango
+ import mimetypes
  
  class DotsProject(gtk.ScrolledWindow):
      def __init__(self, input_file, name):