diff --git a/manifest b/manifest
index d33d4dc49b..7fee650617 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\stests\sto\se_createtable.test.\sAllow\sa\stable\sto\sbe\screated\sif\sthere\sis\san\sindex\sof\sthe\ssame\sname\sin\sa\sdifferent\sattached\sdatabase.
-D 2010-09-28T17:37:28
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Merge\saccidental\sfork.
+D 2010-09-28T17:37:44
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -112,7 +115,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 8dc27638e7e2553e80b2b621f232be5eb1e85ef3
-F src/analyze.c 041ebe729bdbf34bac61bb78ece26e5e84e3ef32
+F src/analyze.c 1ea594a912a14138e20a05db09d9065e46f29a2a
 F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c d5b0137bc20327af08c14772227cc35134839c30
@@ -868,7 +871,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dd1b34bab7edaaedd985882f6e16b16940a46d38
-R 9a005e09da83e134e84a9a0916725a2c
-U dan
-Z d38832569685f81301ba56b0f91fcdf4
+P 6251e587403eed822b9011ed25a3a807e8fa2a6f b7a26427afc43c9bbdf365b775379eb57187bc97
+R 2150b8665a4d77e688c620ae74088521
+U drh
+Z 4d3d211ea9c5b7e168f16846e8aa0e05
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMoifwoxKgR168RlERAthxAJ9/+RgDqmxkVpzT2RPcQd3+CRfM5ACcC32K
+xVhEbt+a4I3tqHSMWTuKYOw=
+=ku2K
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 65a806ae8b..a8dfd29b68 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6251e587403eed822b9011ed25a3a807e8fa2a6f
\ No newline at end of file
+33c8b9c710db6a1a987c11ab6f3a6bc120257ce9
\ No newline at end of file
diff --git a/src/analyze.c b/src/analyze.c
index 7e00f02e8b..159e323612 100644
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -136,8 +136,8 @@ static void analyzeOneTable(
   if( v==0 || NEVER(pTab==0) ){
     return;
   }
-  if( pTab->pSelect ){
-    /* Do not gather statistics on views */
+  if( pTab->tnum==0 ){
+    /* Do not gather statistics on views or virtual tables */
     return;
   }
   if( memcmp(pTab->zName, "sqlite_", 7)==0 ){