merging current boost/python and libs/python from trunk into release branch

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit 9064a063b262 · 2011-12-12T17:46:33.000Z
[SVN r75919]
diff --git a/include/boost/python/slice.hpp b/include/boost/python/slice.hpp
@@ -248,7 +248,7 @@ class slice : public detail::slice_base
     get_indicies( const RandomAccessIterator& begin, 
         const RandomAccessIterator& end) const
     {
-        get_indices(begin, end);
+        return get_indices(begin, end);
     }
         
  public:

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ class slice : public detail::slice_base`
`248`	`248`	`get_indicies( const RandomAccessIterator& begin,`
`249`	`249`	`const RandomAccessIterator& end) const`
`250`	`250`	`{`
`251`		`- get_indices(begin, end);`
	`251`	`+ return get_indices(begin, end);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`public:`