merged v0.6.1.x
authorJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 26 Apr 2011 20:35:34 +0000 (20:35 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Tue, 26 Apr 2011 20:35:34 +0000 (20:35 +0000)
commitae4e306eb72bd43a72fc45195127798521512de6
tree1cb7f4c2feacf1e3c933a0c784818173813031d0
parentb115198c45adf40a02e29b8053c95b072e00cc1f
parentbb17bd814d4568254f17d5fd34901db7d653c1d2
merged v0.6.1.x