Merge branch 'master' into guile-meta
commit03e7271ffdc381e69aae401666df56767799e836
authorJose Antonio Ortega Ruiz <jao@gnu.org>
Sun, 31 Oct 2010 19:04:45 +0000 (31 20:04 +0100)
committerJose Antonio Ortega Ruiz <jao@gnu.org>
Sun, 31 Oct 2010 19:04:45 +0000 (31 20:04 +0100)
treeaf6aa75ae66470a206a16ee0df3a8db2e112fd50
parentffd0a91a136909c4ed481184073e868ae886e230
parent2603c39ff801aa860420d65b589dfe831240d05d
Merge branch 'master' into guile-meta