hal: Branch 'master'

[David Zeuthen]

 Makefile.am |    2 +-
 VERSION     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 59f0b020f8ca4bbca76aa68a1b5d3306f9a6e484 (from 524fa507c4efdccfe434f21493aed1093d0ec4d8)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Apr 25 18:26:40 2007 -0400

    set back VERSION file to 20070402

diff --git a/Makefile.am b/Makefile.am
index 8e43aef..c9bb98d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ release-real:
 	@autoreconf
 	@make dist
 	@scp hal-info-`cat VERSION`.tar.gz david at people.freedesktop.org:public_html/dist
-	@git-commit -m "version `cat VERSION`" -a
+	@git-commit -m "version `cat VERSION`" VERSION
 	@git-tag -s HAL_INFO_`cat VERSION`
 	@git-push
 	@echo "From: $(GIT_AUTHOR_NAME) <$(GIT_AUTHOR_EMAIL)>" > .release-mail
diff --git a/VERSION b/VERSION
index 2a1e6b6..a2b98ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-20070425
+20070402