Merge branch 'v1.1.0' into debian

Conflicts:
	debian/changelog

diff --cc debian/changelog
index ed356b6a92fb4278b718b397e49168c66a6ad706,b821ea9e2d58b2b0a919e36c5fc81f0ad63dff3e..a8c3a0e57b450a5c6b59084b9d0dfea88f5d5228
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,23 @@@
+ openrocket (1.1.0-1) unstable; urgency=low
+ 
+   * new upstream version
+   * update build deps
+ 
+  -- Bdale Garbee <bdale@gag.com>  Tue, 03 Aug 2010 22:50:39 -0400
+ 
 +openrocket (1.0.0-3) unstable; urgency=low
 +
 +  * fix bashism in debian/rules file, closes: #581463
 +
 + -- Bdale Garbee <bdale@gag.com>  Wed, 12 May 2010 23:48:04 -0600
 +
 +openrocket (1.0.0-2) unstable; urgency=low
 +
 +  * fix missing dependencies on Java libraries, closes: #575151
 +  * update build.source to brand build as Debian's at upstream request
 +
 + -- Bdale Garbee <bdale@gag.com>  Tue, 23 Mar 2010 16:54:38 -0600
 +
  openrocket (1.0.0-1) unstable; urgency=low
  
    * initial packaging for Debian

diff --cc debian/control
Simple merge