# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1334580871 -7200
# Node ID c906500af274cd63c39b1dd3cc7972075bd1abcf
# Parent  89d0ae6cb123643c19edc967748ec2ee90c70992# Parent  88cb2ceccacb36e96b5c9f13a541a0e2607e39ea
Merge branch 'stable'

diff -r 89d0ae6cb123 -r c906500af274 .gitignore
--- a/.gitignore	Mon Apr 16 03:40:31 2012 +1000
+++ b/.gitignore	Mon Apr 16 14:54:31 2012 +0200
@@ -1,5 +1,4 @@
-usr/
-log/
-pkg
-dist/
-wip/
+/usr/
+/log/
+/pkg
+/wip/
diff -r 89d0ae6cb123 -r c906500af274 Makefile
--- a/Makefile	Mon Apr 16 03:40:31 2012 +1000
+++ b/Makefile	Mon Apr 16 14:54:31 2012 +0200
@@ -23,7 +23,6 @@
 LOG_DIR    := $(PWD)/log
 TIMESTAMP  := $(shell date +%Y%m%d_%H%M%S)
 PKG_DIR    := $(PWD)/pkg
-DIST_DIR   := $(PWD)/dist
 TMP_DIR     = $(PWD)/tmp-$(1)
 MAKEFILE   := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
 TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))