remerge with master

cmcnulty

2013-11-09 c503ee45ed3a50dc45073df985d80d2bb9653c6e

1
2
3
4
5
6
.panel_wrapper {height:85px;} 
.panel_wrapper div.current {height:85px;} 
 
/* IE */ 
* html .panel_wrapper {height:100px;} 
* html .panel_wrapper div.current {height:100px;}