Merge commit 'refs/top-bases/girocco' into girocco
commit297f955c86062613dec16839547bef6071cc2491
authorPetr Baudis <pasky@ucw.cz>
Fri, 6 Nov 2009 14:30:03 +0000 (6 15:30 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Fri, 6 Nov 2009 14:30:03 +0000 (6 15:30 +0100)
tree135501f0c6c61c5c3f725661229069ef0be12161
parentdcd942a8a7a136c12c8482e5de33cb5e27272e6a
parenta6b4cdbec4df9da4b7bdc67441f1defe2fe1b462
Merge commit 'refs/top-bases/girocco' into girocco