Merge commit 'upstream/0.2.9'
authorJulien Valroff <julien@kirya.net>
Sat, 15 May 2010 16:57:26 +0000 (18:57 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 15 May 2010 16:57:26 +0000 (18:57 +0200)
commite4a416b22ca59cb700c2aae59171f6cf14e00aaa
tree211539db5ffc899477ffdec70b12c7e3c67988b2
parentb2b013bf767624604664ef2a0c3ac2f2e50639f7
parentad2842d7b2c50d92cc1a4ec37a831f8d7aa1e089
Merge commit 'upstream/0.2.9'