Keegan McAllister 
							
						 
					 
					
						
						
							
						
						37c51b80cc 
					 
					
						
						
							
							Add a tool to draw the Django template inheritance graph  
						
						 
						
						... 
						
						
						
						(imported from commit e10bb719d62a76abfea76c7fc69093a3cc33272e) 
						
						
					 
					
						2012-10-16 01:33:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						dbd88b28f3 
					 
					
						
						
							
							Document what all the Django templates are for  
						
						 
						
						... 
						
						
						
						(imported from commit fa2b6c5327b0004f2c19502471f6717d84705ba7) 
						
						
					 
					
						2012-10-16 01:33:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						b55e277930 
					 
					
						
						
							
							Rename more_content -> portico_content  
						
						 
						
						... 
						
						
						
						(imported from commit 4a3df508bb0227e998115eeff24b789dd8b42698) 
						
						
					 
					
						2012-10-16 01:33:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						46f17431cf 
					 
					
						
						
							
							Rename content_base.html -> portico.html  
						
						 
						
						... 
						
						
						
						(imported from commit 556fb5aeca76eb186013a28da9bab77c1e56d700) 
						
						
					 
					
						2012-10-16 01:33:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						ca7855e03e 
					 
					
						
						
							
							Use outerHeight instead of height.  
						
						 
						
						... 
						
						
						
						I think this'll allow for a slighlty more accurate drawing of our
floating recipient row in the even that some of these things have
borders and others don't.
(imported from commit 31714f7356604e1d9c64bcc7f6fd14b8a02a99b5) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						aaca685c4c 
					 
					
						
						
							
							A cheating way of eliminating the floattheworld 1px issue.  
						
						 
						
						... 
						
						
						
						If we make the recipient_rows the same size for huddles and stream
messages, this becomes a non-issue. (Previously, the border on huddles
was 2px, which I think caused our invisible row to have its height
grow by 1px -- which was a problem, because then it left a little 1px
gap that you could see through when we scrolled over non-huddle
messages.)
(imported from commit d1f24e5c536bdf9c0827a15b611ba680ee4e5e36) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						b76422d8d0 
					 
					
						
						
							
							Cache the window selector as 'viewport' in an attempt to improve performance.  
						
						 
						
						... 
						
						
						
						(imported from commit 3e01382260938737fbee663f6a9e94ad495ef21e) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						45629a362d 
					 
					
						
						
							
							Break apart the scroll and mousewheel handlers.  
						
						 
						
						... 
						
						
						
						I'm actually not sure if this is a performance gain or not; I guess it
depends if any of the stuff inside mousewheel or scroll took longer
than 50ms to call (and right now it does).
(imported from commit e3fcc4a14cd8787fa2357a43ed878ab08646e4f2) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						d51aec272d 
					 
					
						
						
							
							Rename. More consistent references to floating_recipient_bar.  
						
						 
						
						... 
						
						
						
						(imported from commit 7bfd2bf55ede0604349faf06944c551a0d23fb73) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						1c56ad00c9 
					 
					
						
						
							
							Optimize update_floating_recipient_bar's showing-and-hiding code.  
						
						 
						
						... 
						
						
						
						(imported from commit 6cd67d9c7bf418ae78288363636ee75fdc3fcada) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						1781a4a616 
					 
					
						
						
							
							Optimize update_floating_recipient_bar's "pick a subject/stream" code.  
						
						 
						
						... 
						
						
						
						(imported from commit a6e615a3939fb072cc9cd310e653f13d690a55cc) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						daf06b9beb 
					 
					
						
						
							
							Hack around visibility: collapse for Chrome.  
						
						 
						
						... 
						
						
						
						(imported from commit 25e6453fe6fa1c5a3c72f56bec2e4bbb089edb4f) 
						
						
					 
					
						2012-10-15 22:47:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						bca36ba4c2 
					 
					
						
						
							
							Eliminate some inline styles (visibility: collapse).  
						
						 
						
						... 
						
						
						
						(imported from commit a29f12ea2f82672ef05e5dcca486ec527acbd6dd) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						4d914df68b 
					 
					
						
						
							
							Rename things.  
						
						 
						
						... 
						
						
						
						narrowbox -> top_statusbar
narrowcontent -> narrowed_to_bar
floating_indicator -> floating_recipient_bar
fixed_narrowbox -> table.floating_recipient
(imported from commit 7b5bbb17aeff9372275311ab09cd3cbf8262ea13) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						acb75ecf67 
					 
					
						
						
							
							Only float narrowbar when #home is active.  
						
						 
						
						... 
						
						
						
						(imported from commit a2da9b5a41e5a645d0c72ef48ff4a856558bed15) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						a80ba151b0 
					 
					
						
						
							
							Eliminate scroll direction detection.  
						
						 
						
						... 
						
						
						
						(imported from commit 2aa8665c9ffa137830fc871061d7e72ba5ccfc6f) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						6015d1d928 
					 
					
						
						
							
							Refactor the 'floating stream/subject' bar.  
						
						 
						
						... 
						
						
						
						(imported from commit 76528653c29809bc461693b069140bfdfbeec97b) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						470143e254 
					 
					
						
						
							
							Add top_whitespace.  
						
						 
						
						... 
						
						
						
						(imported from commit 2c049f3032879926e98287428e839b9117460a90) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						f3ab2dc5ac 
					 
					
						
						
							
							Move the floating stream/subject bar into #narrowbox.  
						
						 
						
						... 
						
						
						
						This allows us to reposition both of them more cleanly
when we resize things.
(imported from commit a772d2390bd80146e91181e348930559a9e2f4eb) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						d95b4a30e2 
					 
					
						
						
							
							Resize the narrowbox, not the 'narrowcontent' when we shrink.  
						
						 
						
						... 
						
						
						
						This allows us to put other stuff in the narrowbox and have
it also magically get resized. At least in theory.
(imported from commit 92975e3d0893b34d52cad910462cbf2ccaed2eab) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Waseem Daher 
							
						 
					 
					
						
						
							
						
						4933a986b9 
					 
					
						
						
							
							Un-remove the normal narrowbar.  
						
						 
						
						... 
						
						
						
						(imported from commit 2dbaa7e482db40b65865c252b9eee081655d5f72) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica McKellar 
							
						 
					 
					
						
						
							
						
						d07f4c05f3 
					 
					
						
						
							
							Keep the top-most recipient row floating at the top of the screen as you scroll.  
						
						 
						
						... 
						
						
						
						(imported from commit e597b60c86f5b38a55dc78df80d84dfe112c8d8f) 
						
						
					 
					
						2012-10-15 22:47:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						8819bdc0fc 
					 
					
						
						
							
							Hide most of the navbar on the deployed app  
						
						 
						
						... 
						
						
						
						(imported from commit 3b055588f7de805bf1b038f1bc6c03837eda010a) 
						
						
					 
					
						2012-10-15 18:44:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						489fd58e43 
					 
					
						
						
							
							Hide register, confirm, etc. on the deployed app  
						
						 
						
						... 
						
						
						
						(imported from commit 8bcf84383d4ea4c24dfadaee330517bfc9801bbd) 
						
						
					 
					
						2012-10-15 18:44:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						1876995abb 
					 
					
						
						
							
							Redirect home to login on deployed server  
						
						 
						
						... 
						
						
						
						(imported from commit 9642a3c6b7b0b55cf5731cc2e241aed51431c8ae) 
						
						
					 
					
						2012-10-15 18:44:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						5141cd7ab9 
					 
					
						
						
							
							Make a setting for where we redirect home for not logged in users  
						
						 
						
						... 
						
						
						
						(imported from commit 95bae4e52d8a8a34c001975e8d3547db5ba256a2) 
						
						
					 
					
						2012-10-15 18:44:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						bcc895b95b 
					 
					
						
						
							
							Avoid expensive queries to check whether the user has any messages.  
						
						 
						
						... 
						
						
						
						(imported from commit 035ec44db7a2f61b1c04e80feebe9af1a214505c) 
						
						
					 
					
						2012-10-15 17:10:55 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						ab9832092d 
					 
					
						
						
							
							Remove an unnecessary @require_post  
						
						 
						
						... 
						
						
						
						(imported from commit c8a43e696dbcfa4cdb494f286e6f0b989d328bd9) 
						
						
					 
					
						2012-10-15 17:05:37 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						277f37aea4 
					 
					
						
						
							
							Fix formatting  
						
						 
						
						... 
						
						
						
						(imported from commit d87311335d97a6e01892b8e341edf95f41977340) 
						
						
					 
					
						2012-10-15 17:05:36 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						bc43613a10 
					 
					
						
						
							
							Some import cleanup  
						
						 
						
						... 
						
						
						
						(imported from commit 265cebb011309b9a880035ccd587a5e51554803a) 
						
						
					 
					
						2012-10-15 16:16:10 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						80e60c3120 
					 
					
						
						
							
							check-all: Show unused imports if passed --imports  
						
						 
						
						... 
						
						
						
						(imported from commit ecae64a3257b3ebd40656717718177270d02111a) 
						
						
					 
					
						2012-10-15 16:16:10 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						fa729c838a 
					 
					
						
						
							
							Move our various Markdown hacks into their own file  
						
						 
						
						... 
						
						
						
						(imported from commit b03a5c64cc95964936c4aba7d667807969e35d21) 
						
						
					 
					
						2012-10-15 16:16:09 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						828fc05da5 
					 
					
						
						
							
							Don't display one's own email when replying to multi-person huddles  
						
						 
						
						... 
						
						
						
						(imported from commit afcf48e17b3dc6f1103f089f8746d462e90c0db7) 
						
						
					 
					
						2012-10-15 15:57:41 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						084608ebda 
					 
					
						
						
							
							Clear compose box when replying to a message  
						
						 
						
						... 
						
						
						
						(imported from commit 1fe21a6d1a5f6f946e14583dc81ede961dbf57c9) 
						
						
					 
					
						2012-10-15 15:45:15 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						8f3aea5cbf 
					 
					
						
						
							
							Fix narrowing to personals with a specific user  
						
						 
						
						... 
						
						
						
						(imported from commit 06f84dd056e8212cb146a17bec37d0bbe63651d0) 
						
						
					 
					
						2012-10-15 15:40:55 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						52bd41bff8 
					 
					
						
						
							
							api: Verify certs for real  
						
						 
						
						... 
						
						
						
						Now that we have a CA-signed cert for the app.
(imported from commit a2d8e95ea581d9af0ba6071b222e06ca82f0612c) 
						
						
					 
					
						2012-10-15 15:31:12 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						8bc511d24e 
					 
					
						
						
							
							Re-initialize the markdown engine every 30 messages.  
						
						 
						
						... 
						
						
						
						Otherwise, the performance leak associated with highlighted code can
cause get_updates to become increasingly slow.
(imported from commit 3c81f245a795e5dd2629c0e571054f2d87089cb7) 
						
						
					 
					
						2012-10-15 15:29:49 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						0dcc7c2914 
					 
					
						
						
							
							puppet: Remove humbug from sudoers  
						
						 
						
						... 
						
						
						
						(imported from commit cdc8aafdcbfafe5fe97a18dfd32b5a7f15a77102) 
						
						
					 
					
						2012-10-15 14:56:12 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						18d48fcd40 
					 
					
						
						
							
							Fix javascript referenced via http url.  
						
						 
						
						... 
						
						
						
						(imported from commit e72e265f5a5ba6b6a362f5be03069f7cd40c8fc1) 
						
						
					 
					
						2012-10-15 14:50:34 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						002e3a5a61 
					 
					
						
						
							
							api: Check against the self-signed cert  
						
						 
						
						... 
						
						
						
						(imported from commit f0444f1af206e5d7ee1c79f7486e9fe17daea0f7) 
						
						
					 
					
						2012-10-15 13:29:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Keegan McAllister 
							
						 
					 
					
						
						
							
						
						45273643ec 
					 
					
						
						
							
							Move humbug-self-signed.crt into a common directory  
						
						 
						
						... 
						
						
						
						(imported from commit 0c914b87c06be7cd7b370d8d0f38efc9f1aaf57f) 
						
						
					 
					
						2012-10-15 13:29:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						a85c1f62d2 
					 
					
						
						
							
							Visually distinguish when a message is persistently vs. temporarily selected  
						
						 
						
						... 
						
						
						
						(imported from commit d626b3460a3a3ad46bd9ebfb65d73a6c267c2251) 
						
						
					 
					
						2012-10-15 13:25:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						0bf78df2f6 
					 
					
						
						
							
							Display full names in narrow description for huddles  
						
						 
						
						... 
						
						
						
						(imported from commit 665df20d129df4d7e516f145f064b90c6e0f34af) 
						
						
					 
					
						2012-10-15 13:25:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zev Benjamin 
							
						 
					 
					
						
						
							
						
						b42cf1d4c8 
					 
					
						
						
							
							Fix persistent message selection across narrows  
						
						 
						
						... 
						
						
						
						(imported from commit 958ce299108f8bbc8579e7446053d7fc9f018b81) 
						
						
					 
					
						2012-10-15 13:25:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						cd14988b47 
					 
					
						
						
							
							Reset the failures count to 0 when restoring from suspend.  
						
						 
						
						... 
						
						
						
						(imported from commit 11b03f8a0565063cc7381dd32a96af79bd26a0d1) 
						
						
					 
					
						2012-10-15 13:20:54 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						bb9c6c4e4a 
					 
					
						
						
							
							zephyr_mirror: Fix --forward-class-messages always being on.  
						
						 
						
						... 
						
						
						
						(imported from commit 8f284a8d8b8f9e1e3fdc8bd60d0ca073cd42e56c) 
						
						
					 
					
						2012-10-15 13:13:57 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						71146c8718 
					 
					
						
						
							
							Use select_related to get the userprofiles for new message recipients.  
						
						 
						
						... 
						
						
						
						(imported from commit afa729230f4ef6fb7f591b3f852fa0b271d64992) 
						
						
					 
					
						2012-10-15 12:56:03 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						002294d522 
					 
					
						
						
							
							Save UserMessage objects within a transaction.  
						
						 
						
						... 
						
						
						
						(imported from commit bd7f36801a754d4f9c09b5d370eee6b62a470b1a) 
						
						
					 
					
						2012-10-15 12:54:53 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						ec37eaf734 
					 
					
						
						
							
							Use select_related() when querying UserProfile objects.  
						
						 
						
						... 
						
						
						
						(imported from commit 584859312e089ad98c4b43032ea29f03eb44a97f) 
						
						
					 
					
						2012-10-15 12:29:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Abbott 
							
						 
					 
					
						
						
							
						
						917a06d5cf 
					 
					
						
						
							
							Use select_related for the get_updates queries.  
						
						 
						
						... 
						
						
						
						(imported from commit 403a5906f9619fb1d6dc10e57ebcaab7e8f00f16) 
						
						
					 
					
						2012-10-15 11:54:12 -04:00