Merge "(bug 457) use semantic headings for the navigation menu"

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc languages/messages/MessagesQqq.php
Simple merge

diff --cc maintenance/language/messages.inc
Simple merge

diff --cc skins/monobook/main.css
index f6b212c,fbb9c1c..4cbc093
--- 1/skins/monobook/main.css
--- 2/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@@ -260,15 -247,11 +248,8 @@@ table.rimage 
        border: 1px solid #aaa;
        padding: 0 .8em .3em .5em;
  }
- .portlet h1,
- .portlet h2,
- .portlet h3,
- .portlet h4 {
-       margin: 0;
-       padding: 0;
- }
  .portlet ul {
        line-height: 1.5em;
 -      list-style-type: square;
 -      /* @embed */
 -      list-style-image: url(bullet.gif);
        font-size: 95%;
  }
  .portlet li {

diff --cc skins/vector/screen.css
Simple merge