# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: respawneral@gmail.com-20111012201648-49mdlmegaqqn22y1
# target_branch: ../mainline/
# testament_sha1: 1a8799704ae897e90166b192595176f0dcc74ad2
# timestamp: 2011-10-12 22:18:38 +0200
# base_revision_id: andrew@operationaldynamics.com-20111010231240-\
#   blxbkqp5tu70xdgz
# 
# Begin patch
=== modified file 'HACKING'
--- HACKING	2011-03-22 00:56:43 +0000
+++ HACKING	2011-10-12 20:16:48 +0000
@@ -140,7 +140,7 @@
 
 but make sure you only commit the stuff you've merged in, not unfinished
 changes you've might have locally! In other words, best to do the merge after
-you've finished anything you might happen to be doing in that branch. 
+you've finished anything you might happen to be doing in that branch.
 
 ### To send a patch
 
@@ -175,6 +175,27 @@
 particular is pretty much required reading if you want to understand what's
 going on.
 
+Testing your code before submitting it
+--------------------------------------
+
+It's generally a good idea to run the tests before submitting or even commiting
+a code. We have a full tests suite that should pass without any failures even
+if you have made a lot of changes in the code base. To be sure that your code
+does not break anything try the following:
+
+    $ make test
+
+If something goes wrong then your code is probably messing up with the rest of
+the library. If you expose new features it's a good thing to write test cases
+which can confirm that your code is working properly. See all classes under the
+`tests/` directory.
+
+Note for Ubuntu users: It is possible that you can see the tests suite fails on
+your operating system specially if you run the Unity desktop. If you are
+experencing some tests failure try to unset the `UBUNTU_MENUPROXY` environment
+variable Thoses failures have been confirmed on Ubuntu 11.04 but it looks like
+they are fixed since Ubuntu 11.10.
+
 STYLE GUIDE
 ===========
 

=== modified file 'README'
--- README	2011-06-25 08:02:39 +0000
+++ README	2011-10-12 20:03:45 +0000
@@ -42,7 +42,7 @@
 
 Once you've downloaded the latest source tarball:
 
-    $ tar xjf java-gnome-4.1.1.tzr.bz2
+    $ tar xjf java-gnome-4.1.1.tar.bz2
     $ cd java-gnome-4.1.1
 
 And go on to step 2 for details about options you can pass to the

# Begin bundle
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
rrceyDVbPY2DMt0Uq0UB/+LuSKcKEgj5A3eA
