[PULL] XQuartz version bump and test/os build fix

[Jeremy Huddleston Sequoia]

The following changes since commit 
a557edca6152ad09c685a00e01534c35a1f00f2e:

   Merge remote-tracking branch 'whot/for-keith' (2012-08-27 08:06:09 
-0700)

are available in the git repository at:


   git://people.freedesktop.org/~jeremyhu/xserver master

for you to fetch changes up to 
486038fe16957b39d39842365c5409c494c9a8df:

   XQuartz: Bump Info.plist version to 2.7.4 (2012-08-27 22:35:51 -0700)

----------------------------------------------------------------
Jeremy Huddleston Sequoia (2):
       test: Make os test more compliant
       XQuartz: Bump Info.plist version to 2.7.4

  hw/xquartz/bundle/Info.plist.cpp | 4 ++--
  test/os.c                        | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)