gitk: Merge branch 'dev' into master
authorPaul Mackerras <paulus@samba.org>
Sat, 14 Nov 2009 10:26:31 +0000 (21:26 +1100)
committerPaul Mackerras <paulus@samba.org>
Sat, 14 Nov 2009 10:26:31 +0000 (21:26 +1100)
commit7a0ebbf829a327768e6d1c32fe1d092814dce4e8
tree7f619836acdd1e0371a87a4a81fdfbeaa0543c2d
parent63ea915e163af144ebc82817be154c0e72c08bda
parentaa43561ac0c18dd6d200afe3a02e4e6c7e4beeae
gitk: Merge branch 'dev' into master

Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk