# HG changeset patch
# User Olivier Delalleau <delallea@iro>
# Date 1283522654 14400
# Node ID 6803b57e1da99333ee126b1d5ca997ac32027c50
# Parent  dc5185cca21eacffb13567f6de4b4ce5c38b2ed7# Parent  a5886b394bdabbb0e433d546717a220730b6eab6
Merged

diff -r a5886b394bda -r 6803b57e1da9 doc/v2_planning/coding_style.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/v2_planning/coding_style.txt	Fri Sep 03 10:04:14 2010 -0400
@@ -0,0 +1,7 @@
+Discussion of Coding-Style
+==========================
+
+Existing Python coding style specifications:
+    * http://www.python.org/dev/peps/pep-0008/
+    * http://google-styleguide.googlecode.com/svn/trunk/pyguide.html
+
diff -r a5886b394bda -r 6803b57e1da9 doc/v2_planning/optimization.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/v2_planning/optimization.txt	Fri Sep 03 10:04:14 2010 -0400
@@ -0,0 +1,3 @@
+Discussion of Optimization-Related Issues
+=========================================
+