Merge from emacs-23

[gnu-emacs] / lisp / fringe.el

diff --git a/lisp/fringe.el b/lisp/fringe.el
index 6f5f496e907d2fb8071b4713a37e1da3afac9eaf..c42e2f8cf061bdc113ee08b6638a0c1480eeec7c 100644 (file)
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,7 +1,7 @@
 ;;; fringe.el --- fringe setup and control  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009, 2010 Free Software Foundation, Inc.
+;;   2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF