Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 16280)
+++ wp-includes/post-template.php	(working copy)
@@ -856,7 +856,7 @@
  * @param array|string $args
  */
 function wp_page_menu( $args = array() ) {
-	$defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
+	$defaults = array('sort_column' => 'menu_order, post_title', 'container_class' => '', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => '');
 	$args = wp_parse_args( $args, $defaults );
 	$args = apply_filters( 'wp_page_menu_args', $args );
 
@@ -889,10 +889,11 @@
 	$list_args['title_li'] = '';
 	$menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
 
-	if ( $menu )
-		$menu = '<ul>' . $menu . '</ul>';
+	$class = $args['menu_class'] ? ' class="'. $args['menu_class'] .'"' : '';
+	$menu = '<ul' . $class . '>' . $menu . '</ul>';
 
-	$menu = '<div class="' . esc_attr($args['menu_class']) . '">' . $menu . "</div>\n";
+	$class = $args['container_class'] ? ' class="' . esc_attr( $args['container_class'] ) . '"' : '';
+	$menu = '<div' . $class . '>' . $menu . "</div>\n";
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
 	if ( $args['echo'] )
 		echo $menu;