[SCM] osgearth branch, lucid, updated. debian/1.4.1-1-31-g908ad5f

[Pirmin Kalberer]

The following commit has been merged in the lucid branch:
commit 908ad5fea0ba26b1fa240917c061520b6fa5f68c
Merge: 1caf86fb095081f6a23f1f93f28efbb0b2cd8489 0222af1ed465032d100b2ff709c84c30a745c5c5
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Wed Nov 30 23:46:45 2011 +0100

    Merge branch 'master' into lucid
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 73efbbf,5050a4b..779a534
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- osgearth (2.0-4~lucid1) lucid; urgency=low
++osgearth (2.1.1+dfsg-1~lucid1) lucid; urgency=low
 +
 +  * Launchpad build for lucid.
 +
-  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Thu, 11 Aug 2011 23:53:05 +0200
++ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Wed, 30 Nov 2011 23:46:22 +0100
++
+ osgearth (2.1.1+dfsg-1) unstable; urgency=low
+ 
+   * Upstream release 2.1.1
+ 
+  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Wed, 30 Nov 2011 22:27:40 +0100
  
  osgearth (2.0-4) unstable; urgency=low
  

-- 
osgEarth terrain rendering toolkit