Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.269
diff -u -p -r1.269 webform.module
--- webform.module	5 Nov 2010 01:05:53 -0000	1.269
+++ webform.module	28 Dec 2010 21:40:01 -0000
@@ -1107,6 +1107,7 @@ function webform_node_load($nodes, $type
     $nodes[$nid]->webform['components'] = db_select('webform_component')
       ->fields('webform_component')
       ->condition('nid', $nid)
+      ->orderBy('weight')
+      ->orderBy('name')
       ->execute()
       ->fetchAllAssoc('cid', PDO::FETCH_ASSOC);