[SCM] gmerlin/master: Update

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0cb72e57b51bc195ae010fffb5a855c50d0de14e
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 10 17:10:38 2011 +0100

    Update

diff --git a/debian/copyright b/debian/copyright
index f917584..1399414 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,6 +46,21 @@ File lib/uthread_sem.c has license:
    * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
    * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+Files: ./plugins/image/targa.c,
+        ./plugins/image/targa.h
+Copyright: 2001-2003, Emil Mikulic
+License: BSD
+ Truevision Targa Reader/Writer
+ Copyright (C) 2001-2003, Emil Mikulic.
+ .
+ Source and binary redistribution of this code, with or without changes, for
+ free or for profit, is allowed as long as this copyright notice is kept
+ intact.  Modified versions must be clearly marked as modified.
+ .
+ This code is provided without any warranty.  The copyright holder is
+ not liable for anything bad that might happen as a result of the
+ code.
+
 User guide has the following license:
    Permission is granted to copy, distribute and/or modify this document 
    under the terms of the GNU Free Documentation License, Version 1.1 or 

-- 
gmerlin packaging