From 470236e9714c1ad2583549ef92988ca1640ef33d Mon Sep 17 00:00:00 2001
From: Rogiel <rogiel@rogiel.com>
Date: Mon, 19 Sep 2011 16:05:44 -0300
Subject: [PATCH] Rebase to 'master'

---
 src/assembly/distribution-derby-bin.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/assembly/distribution-derby-bin.xml b/src/assembly/distribution-derby-bin.xml
index 3a629a1a1..6d8beadce 100644
--- a/src/assembly/distribution-derby-bin.xml
+++ b/src/assembly/distribution-derby-bin.xml
@@ -24,7 +24,11 @@
 			</excludes>
 		</fileSet>
 		<fileSet>
-			<directory>${project.basedir}/dist</directory>
+			<directory>${project.basedir}/distribution/global</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
 		<fileSet>