Merge branch 'master' into libkms-master
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Tue, 5 Jan 2010 19:59:24 +0000 (20:59 +0100)
commit2f7f7ceccab4176217c399502b3ff95df1517627
tree1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2
parentd6059c3dd1300662e941ccd5e55649534fbb9a63
parent6d3b8bbddd44b42d89adb1aafb7645e7f802673a
Merge branch 'master' into libkms-master

Conflicts:
configure.ac
configure.ac