Merge branch 'mark-stable'
commit94b9aad85f1df40f3b4ebb2800521ec5d18e2694
authorJérôme Quelin <jquelin@gmail.com>
Fri, 4 Jul 2008 08:59:19 +0000 (4 10:59 +0200)
committerJérôme Quelin <jquelin@gmail.com>
Fri, 4 Jul 2008 08:59:19 +0000 (4 10:59 +0200)
tree82594e4f8642a12042d5900938ecb5eac498faac
parent3976caf11929d27b527fef1628d11ddb0d3a68ab
parentce1856cbdde96e312e4714cedd455a580401581b
Merge branch 'mark-stable'