Merge branch 'master' of git://gitorious.org/fg/fgdata

Effects/tree.eff

@@ -21,6 +21,7 @@
     <predicate>
       <and>
         <property>/sim/rendering/shader-effects</property>
+		<property>/sim/rendering/random-vegetation</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>

gui/dialogs/rendering.xml

@@ -147,6 +147,8 @@
         </binding>
       </checkbox>
 	  
+	  -->
+
       <checkbox>
         <halign>left</halign>
         <label>Random vegetation</label>
@@ -156,8 +158,6 @@
         </binding>
       </checkbox>
 	  
-	  -->
-	  
 	  <group>
         <layout>hbox</layout>
 	    <text>