merge from v0.6.1.x
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 29 Apr 2011 07:41:03 +0000 (07:41 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 29 Apr 2011 07:41:03 +0000 (07:41 +0000)
commitf91a807375dcec940a09010e64f0c886df33a546
tree57f44d031d579e689577882eeaee42c5e96b3339
parentae4e306eb72bd43a72fc45195127798521512de6
parent1ce91b8acc679fff5ff986eab021c33651dd3903
merge from v0.6.1.x