Merge branch 'devel-2.3'
authorMichael Hanselmann <hansmi@google.com>
Mon, 8 Nov 2010 16:05:37 +0000 (17:05 +0100)
committerMichael Hanselmann <hansmi@google.com>
Mon, 8 Nov 2010 16:05:41 +0000 (17:05 +0100)
commit9097ad6ae73f0693f498831a69c288badfd6bae8
tree5f31c9b428ecaab8cf578153cf91acc3c857f752
parent1e86ee97d0767189df1f5a5d1a1e64e5343e831e
parentf1a791b666fa4efa3ddb9fd1cfe6af1337fccd4e
Merge branch 'devel-2.3'

* devel-2.3:
  Update ganeti-os-interface documentation
  Makefile: Check for empty files and dirs on distcheck
  Revert commit e7e23e73, work around Automake bug

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Makefile.am