Merge commit 'refs/top-bases/girocco' into girocco
commitfcd316343d480200f586a26a520e0ec09456f48e
authorPetr Baudis <pasky@ucw.cz>
Tue, 3 Nov 2009 23:57:40 +0000 (4 00:57 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Tue, 3 Nov 2009 23:57:40 +0000 (4 00:57 +0100)
tree5092f3c052f6c1eabb87c3fe3bdd7ceaa8585083
parent9ef78e4173a6b254960b22e920c8849de87e1020
parent2c99f0da479ced6e6c6b4251d4be6c270475ee89
Merge commit 'refs/top-bases/girocco' into girocco