am a6888d74: Merge change 25459 into eclair

Merge commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae' into eclair-plus-aosp

* commit 'a6888d7448f27b39cb66a26efedf38b06ff9adae':
  Fix sort order of MailboxList

src/com/android/email/activity/MailboxList.java

@@ -321,7 +321,7 @@ public class MailboxList extends ListActivity implements OnItemClickListener, On
                     MailboxList.this.mListAdapter.PROJECTION,
                     MAILBOX_SELECTION,
                     new String[] { String.valueOf(mAccountKey) },
-                    MailboxColumns.TYPE);
+                    MailboxColumns.TYPE + "," + MailboxColumns.DISPLAY_NAME);
         }
 
         @Override