ChangeLog revision bdcaa8d0
1bdcaa8d0Smrgcommit b3872c3317fe560d47a0a621d7a9bd6f81d3573a 2bdcaa8d0SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 3bdcaa8d0SmrgDate: Sat Dec 16 01:54:57 2006 +0200 4bdcaa8d0Smrg 5bdcaa8d0Smrg bump to 4.1.3 6bdcaa8d0Smrg 7bdcaa8d0Smrgcommit 397370ab1099ae1231c9ae709c91a0ad74c82f2b 8bdcaa8d0SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 9bdcaa8d0SmrgDate: Wed Dec 6 18:49:28 2006 +0200 10bdcaa8d0Smrg 11bdcaa8d0Smrg Makefile.am: make ChangeLog hook safer 12bdcaa8d0Smrg Make ChangeLog hook as safe as possible. 13bdcaa8d0Smrg 14bdcaa8d0Smrgcommit 59db4ddcaee381595e4a134de3cc5f6eb8de4fe8 15bdcaa8d0SmrgAuthor: Matthieu Herrb <matthieu@deville.herrb.com> 16bdcaa8d0SmrgDate: Sun Nov 5 19:01:56 2006 +0100 17bdcaa8d0Smrg 18bdcaa8d0Smrg Bump to 4.1.2 19bdcaa8d0Smrg 20bdcaa8d0Smrgcommit 998f5b0fd8f66d248941c0f827bb4912d3bbde93 21bdcaa8d0SmrgAuthor: Matthieu Herrb <matthieu@deville.herrb.com> 22bdcaa8d0SmrgDate: Sun Nov 5 18:59:48 2006 +0100 23bdcaa8d0Smrg 24bdcaa8d0Smrg Replace ChangeLog with a generated file. 25bdcaa8d0Smrg 26bdcaa8d0Smrgcommit d5ffaaa013c8109d894c7015f0258ca1802b0225 27bdcaa8d0SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 28bdcaa8d0SmrgDate: Sun Nov 5 18:14:57 2006 +0100 29bdcaa8d0Smrg 30bdcaa8d0Smrg Add emacs droppings to .gitignore 31bdcaa8d0Smrg 32bdcaa8d0Smrgcommit 9a8c7cc28d80cfb75a55a6896eed25b01f2eb0f6 33bdcaa8d0SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 34bdcaa8d0SmrgDate: Sun Nov 5 18:14:22 2006 +0100 35bdcaa8d0Smrg 36bdcaa8d0Smrg renamed: .cvsignore -> .gitignore 37bdcaa8d0Smrg 38bdcaa8d0Smrgcommit 6dd36416843d033b041864c78832bb4fa6c66fd2 39bdcaa8d0SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 40bdcaa8d0SmrgDate: Sun Nov 5 18:12:02 2006 +0100 41bdcaa8d0Smrg 42bdcaa8d0Smrg Build fix for systems with <elf_abi.h> instead of <elf.h>. Bugzilla #7707. 43bdcaa8d0Smrg 44bdcaa8d0Smrgcommit 9935b3093922798e26d79ae7182d86e0cafa91f5 45bdcaa8d0SmrgAuthor: Adam Jackson <ajax@benzedrine.nwnk.net> 46bdcaa8d0SmrgDate: Fri Oct 13 18:40:46 2006 -0400 47bdcaa8d0Smrg 48bdcaa8d0Smrg Bump to 4.1.1 49bdcaa8d0Smrg 50bdcaa8d0Smrgcommit 4dfc16c59d34780e514d06d74c6cb8ef9f5ad22f 51bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 52bdcaa8d0SmrgDate: Wed Apr 12 20:30:03 2006 +0000 53bdcaa8d0Smrg 54bdcaa8d0Smrg Bug #6564: Additional #include for POSIX. (Matthieu Herrb) 55bdcaa8d0Smrg 56bdcaa8d0Smrgcommit c59c3f4f0854b0bb27a5378d58ebaa3fb0814494 57bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 58bdcaa8d0SmrgDate: Fri Apr 7 19:47:58 2006 +0000 59bdcaa8d0Smrg 60bdcaa8d0Smrg Unlibcwrap. Bump server version requirement. Bump to 4.1.0. 61bdcaa8d0Smrg 62bdcaa8d0Smrgcommit 0723e761f846fa55e850eba14406a106c784dd52 63bdcaa8d0SmrgAuthor: Luc Verhaegen <libv@skynet.be> 64bdcaa8d0SmrgDate: Wed Feb 8 13:08:54 2006 +0000 65bdcaa8d0Smrg 66bdcaa8d0Smrg Rendition: Cull ifdeffed out code which used to call xf86GetClocks. 67bdcaa8d0Smrg Rendition has programmable dotclock anyway. 68bdcaa8d0Smrg 69bdcaa8d0Smrgcommit b8fdfed363a4345cb835c9ea7cd0ceca2db3c964 70bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 71bdcaa8d0SmrgDate: Wed Dec 21 02:30:01 2005 +0000 72bdcaa8d0Smrg 73bdcaa8d0Smrg Update package version for X11R7 release. 74bdcaa8d0Smrg 75bdcaa8d0Smrgcommit cae4e36cd8723c6932f5b467c0880ece3e53c636 76bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 77bdcaa8d0SmrgDate: Mon Dec 19 16:25:54 2005 +0000 78bdcaa8d0Smrg 79bdcaa8d0Smrg Stub COPYING files 80bdcaa8d0Smrg 81bdcaa8d0Smrgcommit 98b1f6995d4f08494e27d3ce5310474bdc10a463 82bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 83bdcaa8d0SmrgDate: Thu Dec 15 00:24:18 2005 +0000 84bdcaa8d0Smrg 85bdcaa8d0Smrg Update package version number for final X11R7 release candidate. 86bdcaa8d0Smrg 87bdcaa8d0Smrgcommit 34b294994fa03eeda73293865dcc273c10268b5d 88bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 89bdcaa8d0SmrgDate: Tue Dec 6 22:48:36 2005 +0000 90bdcaa8d0Smrg 91bdcaa8d0Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 92bdcaa8d0Smrg 93bdcaa8d0Smrgcommit 725c2003e1e4ab4b84b8a66fe1178b6824ba227e 94bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 95bdcaa8d0SmrgDate: Sat Dec 3 05:49:34 2005 +0000 96bdcaa8d0Smrg 97bdcaa8d0Smrg Update package version number for X11R7 RC3 release. 98bdcaa8d0Smrg 99bdcaa8d0Smrgcommit ce7ac7a45bc95817afd1eeacfcf512c4285c685e 100bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 101bdcaa8d0SmrgDate: Fri Dec 2 02:16:09 2005 +0000 102bdcaa8d0Smrg 103bdcaa8d0Smrg Remove extraneous AC_MSG_RESULT. 104bdcaa8d0Smrg 105bdcaa8d0Smrgcommit 0f9d833c0c537ccca8473525b9ddb6e327651230 106bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 107bdcaa8d0SmrgDate: Tue Nov 29 23:30:00 2005 +0000 108bdcaa8d0Smrg 109bdcaa8d0Smrg Only build dlloader modules by default. 110bdcaa8d0Smrg 111bdcaa8d0Smrgcommit 259b50ea6c99df34c1c7fd5664b4f41389ec6f66 112bdcaa8d0SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 113bdcaa8d0SmrgDate: Mon Nov 28 22:04:10 2005 +0000 114bdcaa8d0Smrg 115bdcaa8d0Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 116bdcaa8d0Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 117bdcaa8d0Smrg 118bdcaa8d0Smrgcommit c8d78848d2690488be409bfa4cc68b5592ae73a9 119bdcaa8d0SmrgAuthor: Eric Anholt <anholt@freebsd.org> 120bdcaa8d0SmrgDate: Mon Nov 21 10:49:16 2005 +0000 121bdcaa8d0Smrg 122bdcaa8d0Smrg Add .cvsignores for drivers. 123bdcaa8d0Smrg 124bdcaa8d0Smrgcommit ea9a31afadd414b98e7d9da885e8746bc69f2253 125bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 126bdcaa8d0SmrgDate: Fri Nov 11 20:23:36 2005 +0000 127bdcaa8d0Smrg 128bdcaa8d0Smrg Monolith parity, only install the .uc files, not .data 129bdcaa8d0Smrg 130bdcaa8d0Smrgcommit 03aef516214058e956706b9be3749863e8e60232 131bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 132bdcaa8d0SmrgDate: Wed Nov 9 21:31:21 2005 +0000 133bdcaa8d0Smrg 134bdcaa8d0Smrg Bump version numbers for X11R6.9/X11R7 RC2. 135bdcaa8d0Smrg 136bdcaa8d0Smrgcommit 9888b941c84b632d670b4764157b36a677edcd7e 137bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 138bdcaa8d0SmrgDate: Wed Nov 9 21:15:20 2005 +0000 139bdcaa8d0Smrg 140bdcaa8d0Smrg Update package version number for X11R7 RC2 release. 141bdcaa8d0Smrg 142bdcaa8d0Smrgcommit 2e19028b6b96675cdd8dc283e25a720eb16a6aca 143bdcaa8d0SmrgAuthor: Kean Johnson <kean@armory.com> 144bdcaa8d0SmrgDate: Tue Nov 8 06:33:28 2005 +0000 145bdcaa8d0Smrg 146bdcaa8d0Smrg See ChangeLog entry 2005-11-07 for details. 147bdcaa8d0Smrg 148bdcaa8d0Smrgcommit 625d7c3bee425ecf8d154776448bf15bd97d8525 149bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 150bdcaa8d0SmrgDate: Tue Nov 1 15:08:54 2005 +0000 151bdcaa8d0Smrg 152bdcaa8d0Smrg Update pkgcheck depedencies to work with separate build roots. 153bdcaa8d0Smrg 154bdcaa8d0Smrgcommit b7e9f7f67b01848786a53a7a910a1062d334ad72 155bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 156bdcaa8d0SmrgDate: Wed Oct 19 02:48:04 2005 +0000 157bdcaa8d0Smrg 158bdcaa8d0Smrg Update package version number for RC1 release. 159bdcaa8d0Smrg 160bdcaa8d0Smrgcommit 515103e0af4a3b77ed0954f3fdad492177325ec4 161bdcaa8d0SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 162bdcaa8d0SmrgDate: Tue Oct 18 00:01:54 2005 +0000 163bdcaa8d0Smrg 164bdcaa8d0Smrg Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro 165bdcaa8d0Smrg substitutions to work better with BSD make 166bdcaa8d0Smrg 167bdcaa8d0Smrgcommit 2e861a9f1012c62b2355391217028c276c8f9e8a 168bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 169bdcaa8d0SmrgDate: Mon Oct 17 22:57:35 2005 +0000 170bdcaa8d0Smrg 171bdcaa8d0Smrg More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead 172bdcaa8d0Smrg of indirectly 173bdcaa8d0Smrg 174bdcaa8d0Smrgcommit 8c7050a21016623fc134877644145a95f2cd74cf 175bdcaa8d0SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 176bdcaa8d0SmrgDate: Mon Oct 17 00:09:04 2005 +0000 177bdcaa8d0Smrg 178bdcaa8d0Smrg Use sed & cpp to substitute variables in driver man pages 179bdcaa8d0Smrg 180bdcaa8d0Smrgcommit f7efbfaa8c4f68a7c26a87da3f3d1e2a05bfff8c 181bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 182bdcaa8d0SmrgDate: Thu Oct 13 21:16:32 2005 +0000 183bdcaa8d0Smrg 184bdcaa8d0Smrg Remove orphaned references to xf[14]bpp. 185bdcaa8d0Smrg 186bdcaa8d0Smrgcommit 63d931868260f82fde17767efb21db592ca4df33 187bdcaa8d0SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 188bdcaa8d0SmrgDate: Tue Oct 4 20:01:03 2005 +0000 189bdcaa8d0Smrg 190bdcaa8d0Smrg Check in generated README files 191bdcaa8d0Smrg 192bdcaa8d0Smrgcommit 31d5b943184c592a232435996d079009bff2410c 193bdcaa8d0SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 194bdcaa8d0SmrgDate: Mon Oct 3 21:22:08 2005 +0000 195bdcaa8d0Smrg 196bdcaa8d0Smrg - For all drivers that have a <driver>.sgml file, add code in their build 197bdcaa8d0Smrg system to build the README file at make dist time 198bdcaa8d0Smrg - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that 199bdcaa8d0Smrg will check if the required tools and files exist, and if so set a 200bdcaa8d0Smrg conditional. 201bdcaa8d0Smrg - util/modular/symlink.sh 202bdcaa8d0Smrg - Link all the <driver>.sgml to xf86-video-<driver>/README.sgml 203bdcaa8d0Smrg - Add all the README.<driver> to the list of excluded files 204bdcaa8d0Smrg - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make 205bdcaa8d0Smrg it spew less warnings when the text file is built. 206bdcaa8d0Smrg 207bdcaa8d0Smrgcommit a0aa21229a97d6e2111b607312f4144da05d7f68 208bdcaa8d0SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 209bdcaa8d0SmrgDate: Wed Sep 28 15:58:45 2005 +0000 210bdcaa8d0Smrg 211bdcaa8d0Smrg Dist data to make rendition driver pass distcheck 212bdcaa8d0Smrg 213bdcaa8d0Smrgcommit 7a6cdd84fca0b55fbcebac37e9d2c2dd6ad09d7c 214bdcaa8d0SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 215bdcaa8d0SmrgDate: Tue Sep 27 22:22:16 2005 +0000 216bdcaa8d0Smrg 217bdcaa8d0Smrg Add some files to the rendition and sunffb build systems 218bdcaa8d0Smrg 219bdcaa8d0Smrgcommit f957da4c5f904557804a3113add92969d5c7ae0e 220bdcaa8d0SmrgAuthor: Eric Anholt <anholt@freebsd.org> 221bdcaa8d0SmrgDate: Wed Sep 14 07:56:55 2005 +0000 222bdcaa8d0Smrg 223bdcaa8d0Smrg Install the microcode in the modules dir, as the monolithic build does. 224bdcaa8d0Smrg 225bdcaa8d0Smrgcommit 8abe45c3ae9d1eada32f001d8e731262fbadd680 226bdcaa8d0SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 227bdcaa8d0SmrgDate: Thu Aug 18 09:03:47 2005 +0000 228bdcaa8d0Smrg 229bdcaa8d0Smrg Update autogen.sh to one that does objdir != srcdir. 230bdcaa8d0Smrg 231bdcaa8d0Smrgcommit ef7921174f0254945afcb897609f7dfe5117081a 232bdcaa8d0SmrgAuthor: Kevin E Martin <kem@kem.org> 233bdcaa8d0SmrgDate: Fri Jul 29 21:22:44 2005 +0000 234bdcaa8d0Smrg 235bdcaa8d0Smrg Various changes preparing packages for RC0: 236bdcaa8d0Smrg - Verify and update package version numbers as needed 237bdcaa8d0Smrg - Implement versioning scheme 238bdcaa8d0Smrg - Change bug address to point to bugzilla bug entry form 239bdcaa8d0Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 240bdcaa8d0Smrg reenable it) 241bdcaa8d0Smrg - Fix makedepend to use pkgconfig and pass distcheck 242bdcaa8d0Smrg - Update build script to build macros first 243bdcaa8d0Smrg - Update modular Xorg version 244bdcaa8d0Smrg 245bdcaa8d0Smrgcommit a705b3f7934be052f001603b58dce1f089aff91a 246bdcaa8d0SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 247bdcaa8d0SmrgDate: Tue Jul 26 18:45:47 2005 +0000 248bdcaa8d0Smrg 249bdcaa8d0Smrg Build system for rendition 250bdcaa8d0Smrg 251bdcaa8d0Smrgcommit 9accd592ec5f3afa5777872008d81624bbbffe54 252bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 253bdcaa8d0SmrgDate: Mon Jul 11 02:29:58 2005 +0000 254bdcaa8d0Smrg 255bdcaa8d0Smrg Prep for modular builds by adding guarded #include "config.h" everywhere. 256bdcaa8d0Smrg 257bdcaa8d0Smrgcommit 6567bb5128407e9e098b602b1b0d5cd94d7bfc0b 258bdcaa8d0SmrgAuthor: Adam Jackson <ajax@nwnk.net> 259bdcaa8d0SmrgDate: Sat Jun 25 21:16:55 2005 +0000 260bdcaa8d0Smrg 261bdcaa8d0Smrg Bug #3626: _X_EXPORT tags for video and input drivers. 262bdcaa8d0Smrg 263bdcaa8d0Smrgcommit bd23ae5f99a76f7ea784f62a30544f31baedb307 264bdcaa8d0SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 265bdcaa8d0SmrgDate: Wed Apr 20 12:25:29 2005 +0000 266bdcaa8d0Smrg 267bdcaa8d0Smrg Fix includes right throughout the Xserver tree: 268bdcaa8d0Smrg change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; 269bdcaa8d0Smrg change "foo.h", "extensions/foo.h" and "X11/foo.h" to 270bdcaa8d0Smrg <X11/extensions/foo.h> for extension headers, e.g. Xv.h; 271bdcaa8d0Smrg change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files. 272bdcaa8d0Smrg 273bdcaa8d0Smrgcommit 8352e1febb4136d28a66b0daa248b419c420b6af 274bdcaa8d0SmrgAuthor: Eric Anholt <anholt@freebsd.org> 275bdcaa8d0SmrgDate: Wed Jun 16 09:24:13 2004 +0000 276bdcaa8d0Smrg 277bdcaa8d0Smrg DRI XFree86-4_3_99_12-merge import 278bdcaa8d0Smrg 279bdcaa8d0Smrgcommit 583f85aad19d41987a089d28acded5e846aff71c 280bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 281bdcaa8d0SmrgDate: Fri Apr 23 19:42:41 2004 +0000 282bdcaa8d0Smrg 283bdcaa8d0Smrg Merging XORG-CURRENT into trunk 284bdcaa8d0Smrg 285bdcaa8d0Smrgcommit 3be5437c8270dc20e271f9f692d246dda5b84c60 286bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 287bdcaa8d0SmrgDate: Sun Mar 14 08:33:30 2004 +0000 288bdcaa8d0Smrg 289bdcaa8d0Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 290bdcaa8d0Smrg 291bdcaa8d0Smrgcommit 7adf752647c09920ce46a347a6e39aa8bc89dd55 292bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 293bdcaa8d0SmrgDate: Wed Mar 3 12:12:23 2004 +0000 294bdcaa8d0Smrg 295bdcaa8d0Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 296bdcaa8d0Smrg 297bdcaa8d0Smrgcommit acf9f479b6759f9c9d71829ee28ca4db0acfeca4 298bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 299bdcaa8d0SmrgDate: Thu Feb 26 13:35:54 2004 +0000 300bdcaa8d0Smrg 301bdcaa8d0Smrg readding XFree86's cvs IDs 302bdcaa8d0Smrg 303bdcaa8d0Smrgcommit e3035db18f828ef26fada297dcb3ad3c05d46033 304bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 305bdcaa8d0SmrgDate: Thu Feb 26 09:23:23 2004 +0000 306bdcaa8d0Smrg 307bdcaa8d0Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 308bdcaa8d0Smrg 309bdcaa8d0Smrgcommit 5c1c3690ddc5161f424b16e39f827288bd4e19e1 310bdcaa8d0SmrgAuthor: Egbert Eich <eich@suse.de> 311bdcaa8d0SmrgDate: Thu Jan 29 08:08:36 2004 +0000 312bdcaa8d0Smrg 313bdcaa8d0Smrg Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 314bdcaa8d0Smrg 315bdcaa8d0Smrgcommit 0f7b2fb64d8a84cf5b4b2394a4d8ed95b56aa4d3 316bdcaa8d0SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 317bdcaa8d0SmrgDate: Tue Nov 25 19:28:38 2003 +0000 318bdcaa8d0Smrg 319bdcaa8d0Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 320bdcaa8d0Smrg 321bdcaa8d0Smrgcommit fccdc80b12e14862e954520a14aa3df14e795961 322bdcaa8d0SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 323bdcaa8d0SmrgDate: Fri Nov 14 16:48:55 2003 +0000 324bdcaa8d0Smrg 325bdcaa8d0Smrg XFree86 4.3.0.1 326bdcaa8d0Smrg 327bdcaa8d0Smrgcommit 5829e7dac95cea113b0895e7a5a3625bbf8a0529 328bdcaa8d0SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 329bdcaa8d0SmrgDate: Fri Nov 14 16:48:55 2003 +0000 330bdcaa8d0Smrg 331bdcaa8d0Smrg Initial revision 332