compiz: Changes to 'master'

[David Reveman]

 src/window.c |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit 93d2942ced2d30a3cdfe9f412be2a652974c5249
Merge: 65f0ddb... f647b95...
Author: David Reveman <davidr at novell.com>
Date:   Tue May 15 11:38:33 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 65f0ddbc4d09455f45a77b4e40059d9f692dc96f
Author: David Reveman <davidr at novell.com>
Date:   Tue May 15 11:35:36 2007 -0400

    Fix size hint calculations. If a base size is not provided,
    the minimum size is to be used in its place and vice versa.