Merge branch 'nikosmaster'
[ptas] / zouba / debian / emacsen-startup.ex
2010-03-24 Max WatermanAdded icon.