merge from stable
authorDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 29 Aug 2008 21:05:25 +0000 (23:05 +0200)
committerDag Sverre Seljebotn <dagss@student.matnat.uio.no>
Fri, 29 Aug 2008 21:05:25 +0000 (23:05 +0200)
commit6363c558b79b7626367d788dc7e992c6c9cfc10b
treee677f5d69daae8e4a09d36237f55ed87a0e531a6
parentf40c96907d1ee3b81b562bdf033cca44b14b68c9
parent55cf301b93b757e29b62932b5cc44df0e5026bae
merge from stable