# HG changeset patch # User Steve Losh # Date 1256167934 14400 # Node ID 26150fdd04b848c68633be6c574d5903098c2004 # Parent 82f04bfc46b87cebf3644fd9b577c7234c98b8ed# Parent 5c274209a7ecfd83648d48a9109784a7b027d4d6 Merge the webui into the mainline.