diff --git a/2012-05-17-fun-python-question.html b/2012-05-17-fun-python-question.html
new file mode 100644
index 0000000..e27fa1b
--- /dev/null
+++ b/2012-05-17-fun-python-question.html
@@ -0,0 +1,18 @@
+<!--# set var="title" value="Fun Python question" -->
+<!--# set var="date" value="May 17, 2012" -->
+
+<!--# include file="include/top.html" -->
+
+<p>What does this do?</p>
+
+<pre><code>def func():
+  print 'foo'
+  return
+  yield 'bar'
+
+print func()
+</code></pre>
+
+<p>Take a guess, then give it a try.</p>
+
+<!--# include file="include/bottom.html" -->
diff --git a/index.html b/index.html
index c007f26..f59270a 100644
--- a/index.html
+++ b/index.html
@@ -20,6 +20,7 @@
 <li>2016-Feb-15: <a href="2016-02-15-cable-modem-channel-party.html">Cable modem channel party</a></li>
 <li>2016-Feb-01: <a href="2016-02-01-how-to-enrage-your-cable-modem.html">How to enrage your cable modem</a></li>
 <li>2016-Feb-01: <a href="2016-02-01-hall-of-2-4-ghz-shame-2016-edition.html">Hall of 2.4 GHz Shame, 2016 Edition</a></li>
+<li>2012-May-17: <a href="2012-05-17-fun-python-question.html">Fun Python question</a></li>
 <li>2012-Mar-09: <a href="2012-03-09-google-mysql-team-is-hiring.html">Google MySQL team is hiring</a></li>
 <li>2011-Dec-09: <a href="2011-12-09-the-dangers-of-max-connections.html">The dangers of max_connections</a></li>
 <li>2011-Nov-29: <a href="2011-11-29-converting-subselects-to-joins-part-2.html">Converting subselects to joins, part 2</a></li>
diff --git a/markdown/2012-05-17-fun-python-question.md b/markdown/2012-05-17-fun-python-question.md
new file mode 100644
index 0000000..fe00163
--- /dev/null
+++ b/markdown/2012-05-17-fun-python-question.md
@@ -0,0 +1,17 @@
+<!--# set var="title" value="Fun Python question" -->
+<!--# set var="date" value="May 17, 2012" -->
+
+<!--# include file="include/top.html" -->
+
+What does this do?
+
+    def func():
+      print 'foo'
+      return
+      yield 'bar'
+
+    print func()
+
+Take a guess, then give it a try.
+
+<!--# include file="include/bottom.html" -->
diff --git a/markdown/index.md b/markdown/index.md
index f9d2fb6..384525f 100644
--- a/markdown/index.md
+++ b/markdown/index.md
@@ -19,6 +19,7 @@
 1. 2016-Feb-15: [Cable modem channel party](2016-02-15-cable-modem-channel-party.html)
 1. 2016-Feb-01: [How to enrage your cable modem](2016-02-01-how-to-enrage-your-cable-modem.html)
 1. 2016-Feb-01: [Hall of 2.4 GHz Shame, 2016 Edition](2016-02-01-hall-of-2-4-ghz-shame-2016-edition.html)
+1. 2012-May-17: [Fun Python question](2012-05-17-fun-python-question.html)
 1. 2012-Mar-09: [Google MySQL team is hiring](2012-03-09-google-mysql-team-is-hiring.html)
 1. 2011-Dec-09: [The dangers of max_connections](2011-12-09-the-dangers-of-max-connections.html)
 1. 2011-Nov-29: [Converting subselects to joins, part 2](2011-11-29-converting-subselects-to-joins-part-2.html)