Merge branch 'master' of /afs/sipb.mit.edu/project/sipb-www/wiki

diff --combined style.css
index 41d1453899a5d257cbb9470252d36f29d71755fb,4735e62d8d4b739c5269bc1399ce2a2636a392c2..3d07de06f7f9099bcaa0c02b9a05c579f78a7473
--- 1/style.css
--- 2/style.css
+++ b/style.css
@@@ -78,6 -78,7 +78,6 @@@ ul#navigation li a
        color:#ffffff;
        text-decoration: none;
        text-transform: uppercase;
 -      font-size:1.2em;
        display:block;
        width:94px;
        height:47px;
@@@ -215,7 -216,7 +215,7 @@@ dl.services dd
        font-weight: bold;
        font-size:1.2em;
  }
- #highlights-block div{
+ #highlights-block div, #margin-block > div {
        margin-bottom: 8px;
  }
  .extra-large{
@@@ -325,4 -326,4 +325,4 @@@
  }
  .actions ul li a:hover{
        text-decoration:underline;
 -}
 +}