Merge branch 'master' into ubuntu-master

Conflicts:

	config.sh.sed.in

diff --combined static/packages.css.sed.in
index f60f4a46261acef24a778ce7cd89f11c3a894e8b,ca44350e58f79e78809cf6b1dd470f5d65cb7b8c..dc2ef7d9793d941648bd4c5bbe171367b2e4b743
--- 1/static/packages.css.sed.in
--- 2/static/packages.css.sed.in
+++ b/static/packages.css.sed.in
@@@ -44,23 -44,24 +44,32 @@@ h1 
               font-size: smaller;
               margin-left: 1em;
               float: right;
 -             background-color: #BBDDFF;
 -             border: thin solid #BFC3DC;
 +             background-color: white;
 +           color: #5B4832;
 +             border: thin solid #5B4832;
               padding: 1em .5em;
               width: auto;
 +             max-width: 20%;
 +}
 +#pmoreinfo h2 {
 +             border-bottom: none;
 +           color: #5B4832;
  }
  #pmoreinfo h3 {
               border-top: thin solid black;
 +           border-bottom: none;
 +           color: #5B4832;
  }
  
+ #impressum {
+     text-align: left;
+     float: left;
+ }
+ 
+ #sponsorfooter {
+       text-align: right;
+ }
+ 
  /*
  
    DESCRIPTIONS
@@@ -258,8 -259,7 +267,8 @@@ table#pdeplegend, #pdownload table 
        padding: .3em;
        border-top: solid gray thin;
        border-bottom: solid gray thin;
 -      background-color: #bdf;
 +        background-color: #dbba75;
 +      color: #5B4832;
  }
  #psearchres li {
        margin-top: 1em;
@@@ -312,9 -312,8 +321,9 @@@
        padding-bottom: 4px;
        height: auto;
        text-align: left;
 -      background: #DF0451;
 -      color: yellow;
 +        background-color: white;
 +      color: #5B4832;
 +        border-bottom: thin solid #5B4832;
        font-size: smaller;
        font-weight: bold;
  }
@@@ -329,8 -328,9 +338,8 @@@
        margin: 0;
        white-space: nowrap;
  }
 -#pnavbar a {
 -      color: yellow;
 -      text-decoration: none;
 +#pnavbar a, #pmoreinfo a {
 +      color: #5B4832;
  }
  #pnavbar a:hover {
  }
@@@ -373,7 -373,7 +382,7 @@@
  .pvcslink { 
  }
  
 -#pnavbar, .pconstantnag, #psitewidemsg {
 +.pconstantnag, #psitewidemsg {
        -moz-border-radius: 15px;
        /* this goes to the end as the css validator does not like it
        will be replaced by border-radius with css3 */