gmerlin new upstream!

[Alessio Treglia]

On Mon, Jan 10, 2011 at 5:34 PM, Jonas Smedegaard <dr at jones.dk> wrote:
> Please elaborate, instead of expecting us all to be online: The URL is not
> very descriptive.

The above file contains some code covered by a BSD 4-clause license:

  62 /*-
  63  * Copyright (c) 1996, 1997
  64  *      HD Associates, Inc.  All rights reserved.
  65  *
  66  * Redistribution and use in source and binary forms, with or without
  67  * modification, are permitted provided that the following conditions
  68  * are met:
  69  * 1. Redistributions of source code must retain the above copyright
  70  *    notice, this list of conditions and the following disclaimer.
  71  * 2. Redistributions in binary form must reproduce the above copyright
  72  *    notice, this list of conditions and the following disclaimer in the
  73  *    documentation and/or other materials provided with the distribution.
  74  * 3. All advertising materials mentioning features or use of this software
  75  *    must display the following acknowledgement:
  76  *      This product includes software developed by HD Associates, Inc
  77  * 4. Neither the name of the author nor the names of any co-contributors
  78  *    may be used to endorse or promote products derived from this software
  79  *    without specific prior written permission.
[cut]


-- 
Alessio Treglia          | www.alessiotreglia.com
Debian Developer         | alessio at debian.org
Ubuntu Core Developer    | quadrispro at ubuntu.com
0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0