hal: Branch 'master'

[David Zeuthen]

 hald/linux2/blockdev.c |    2 --
 1 files changed, 2 deletions(-)

New commits:
diff-tree ad7baa0bc2e7bcf9ee6102c035503e782276e82e (from 1ddcce85eaf8693eeeeff62749d87e93f5355e00)
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Jul 27 23:46:40 2006 -0400

    Change license of hald/linux2/blockdev.c to GPL only as I just
    introduced some copy-pasted LGPL code.

diff --git a/hald/linux2/blockdev.c b/hald/linux2/blockdev.c
index 5ab0b4e..8eea252 100644
--- a/hald/linux2/blockdev.c
+++ b/hald/linux2/blockdev.c
@@ -6,8 +6,6 @@
  * Copyright (C) 2005 David Zeuthen, <david at fubar.dk>
  * Copyright (C) 2005,2006 Kay Sievers, <kay.sievers at vrfy.org>
  *
- * Licensed under the Academic Free License version 2.1
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or